diff --git a/src/ui/interactivesimulation/JFrameInteractiveSimulation.java b/src/ui/interactivesimulation/JFrameInteractiveSimulation.java index e085b6ddefcae9c5212a5a64ef3b658f966dcba4..4adb469b406b6f7fe88909f1187e35b49b37b9a1 100755 --- a/src/ui/interactivesimulation/JFrameInteractiveSimulation.java +++ b/src/ui/interactivesimulation/JFrameInteractiveSimulation.java @@ -1574,7 +1574,8 @@ public class JFrameInteractiveSimulation extends JFrame implements ActionListene } else if (msg != null) { printFromServer("Server: " + msg); } else { - printFromServer("Server: error " + error); + //TraceManager.addDev("Node: " +node1 + " diagramNL=" + diagramNl); + //printFromServer("Server: error " + error); } if ((hash != null) && (tmap != null)) { diff --git a/src/ui/tmlcompd/TMLCCompositePort.java b/src/ui/tmlcompd/TMLCCompositePort.java index 45f15a2213d40be69c9f1b86510a0bf56165cb60..12744bf26122fc03812f907f4a2fb627ee558ec6 100755 --- a/src/ui/tmlcompd/TMLCCompositePort.java +++ b/src/ui/tmlcompd/TMLCCompositePort.java @@ -152,7 +152,7 @@ public class TMLCCompositePort extends TMLCChannelFacility implements SwallowedT int []px = new int[3]; int []py = new int[3]; switch(wayTo) { - case GraphicLib.NORTH: + /*case GraphicLib.NORTH: px[0] = x + decPoint; px[1] = x + width - decPoint; px[2] = x + width/2; @@ -183,10 +183,24 @@ public class TMLCCompositePort extends TMLCChannelFacility implements SwallowedT px[2] = x + width - decPoint; py[0] = y + decPoint; py[1] = y + height - decPoint; - py[2] = y + height/2; + py[2] = y + height/2;*/ + case GraphicLib.NORTH: + case GraphicLib.SOUTH: + px[0] = x+width/2; + px[1] = x +width/2; + py[0] = y; + py[1] = y + height; + case GraphicLib.EAST: + case GraphicLib.WEST: + default: + px[0] = x; + px[1] = x +width; + py[0] = y+height/2; + py[1] = y + height/2; + break; } - g.drawPolygon(px, py, 3); - g.fillPolygon(px, py, 3); + g.drawPolygon(px, py, 2); + //g.fillPolygon(px, py, 2); } } diff --git a/src/ui/window/JDialogSystemCGeneration.java b/src/ui/window/JDialogSystemCGeneration.java index 1955be993fe9b448595454303e6589db174aa04f..321805f358a17d0b95d96bacc0c5c766c949bff0 100755 --- a/src/ui/window/JDialogSystemCGeneration.java +++ b/src/ui/window/JDialogSystemCGeneration.java @@ -715,8 +715,8 @@ public class JDialogSystemCGeneration extends javax.swing.JDialog implements Act // Assuma data are on the remote host // Command try { - data = processCmd(cmd); - jta.append(data); + processCmd(cmd, jta); + //jta.append(data); jta.append("Compilation done\n"); } catch (LauncherException le) { jta.append("Error: " + le.getMessage() + "\n"); @@ -740,8 +740,8 @@ public class JDialogSystemCGeneration extends javax.swing.JDialog implements Act // Assuma data are on the remote host // Command - data = processCmd(cmd); - jta.append(data); + processCmd(cmd, jta); + //jta.append(data); jta.append("Execution done\n"); } catch (LauncherException le) { jta.append("Error: " + le.getMessage() + "\n"); @@ -771,12 +771,14 @@ public class JDialogSystemCGeneration extends javax.swing.JDialog implements Act //System.out.println("Selected item=" + selectedItem); } - protected String processCmd(String cmd) throws LauncherException { + protected void processCmd(String cmd, JTextArea _jta) throws LauncherException { rshc.setCmd(cmd); String s = null; rshc.sendProcessRequest(); - s = rshc.getDataFromProcess(); - return s; + rshc.fillJTA(_jta); + //s = rshc.getDataFromProcess(); + //return s; + return; } protected void checkMode() {