diff --git a/src/ui/TGUIAction.java b/src/ui/TGUIAction.java
index 1b891469f78fc06493de9671c5c16994585ffdde..fe49d12bea96d118250a464dda0f30b8ed3a8bb3 100755
--- a/src/ui/TGUIAction.java
+++ b/src/ui/TGUIAction.java
@@ -888,8 +888,8 @@ public class TGUIAction extends AbstractAction {
actions[TMLARCHI_BUSNODE] = new TAction("add-tmlarchi-busnode", "Add a Bus node", IconManager.imgic1102, IconManager.imgic1102, "Bus node", "Add a bus node to the currently opened DIPLODOCUS architecture diagram", 0);
actions[TMLARCHI_CPNODE] = new TAction("add-tmlarchi-cpnode", "Add a Communication pattern node", IconManager.imgic1102, IconManager.imgic1102, "CP node", "Add a communication pattern node to the currently opened DIPLODOCUS architecture diagram", 0);
actions[TMLARCHI_ARTIFACT] = new TAction("add-tmlarchi-artifact", "Map a task", IconManager.imgic702, IconManager.imgic702, "Map a task", "Map a task onto a node in the currently opened DIPLODOCUS architecture diagram", 0);
- actions[TMLARCHI_COMMUNICATION_ARTIFACT] = new TAction("add-tmlarchi-communication-artifact", "Map a channel / request", IconManager.imgic702, IconManager.imgic702, "Map a channel / request", "Map a channel or request onto a node in the currently opened DIPLODOCUS architecture diagram", 0);
- actions[TMLARCHI_EVENT_ARTIFACT] = new TAction("add-tmlarchi-event-artifact", "Map an event", IconManager.imgic702, IconManager.imgic702, "Map an event", "Map an event onto a node in the currently opened DIPLODOCUS architecture diagram", 0);
+ actions[TMLARCHI_COMMUNICATION_ARTIFACT] = new TAction("add-tmlarchi-communication-artifact", "Map a channel", IconManager.imgic702, IconManager.imgic702, "Map a channel", "Map a channel onto a node in the currently opened DIPLODOCUS architecture diagram", 0);
+ actions[TMLARCHI_EVENT_ARTIFACT] = new TAction("add-tmlarchi-event-artifact", "Map an event / request", IconManager.imgic702, IconManager.imgic702, "Map an event/request", "Map an event or a request onto a node in the currently opened DIPLODOCUS architecture diagram", 0);
actions[TMLARCHI_BRIDGENODE] = new TAction("add-tmlarchi-bridgenode", "Add a Bridge node", IconManager.imgic1104, IconManager.imgic1104, "Bridge node", "Add a bridge node to the currently opened DIPLODOCUS architecture diagram", 0);
actions[TMLARCHI_HWANODE] = new TAction("add-tmlarchi-hwanode", "Add a hardware accelerator node", IconManager.imgic1106, IconManager.imgic1106, "Hardware accelerator node", "Add a hardware accelerator node to the currently opened DIPLODOCUS architecture diagram", 0);
actions[TMLARCHI_MEMORYNODE] = new TAction("add-tmlarchi-memorynode", "Add a memory node", IconManager.imgic1108, IconManager.imgic1108, "Memory node", "Add a memory node to the currently opened DIPLODOCUS architecture diagram", 0);
diff --git a/src/ui/tmlcompd/TMLComponentTaskDiagramPanel.java b/src/ui/tmlcompd/TMLComponentTaskDiagramPanel.java
index 3537c187392140042abfb3b8ce9ca2e0460132ab..1991b3e4566f597b5f017cbd93725a837aa71562 100755
--- a/src/ui/tmlcompd/TMLComponentTaskDiagramPanel.java
+++ b/src/ui/tmlcompd/TMLComponentTaskDiagramPanel.java
@@ -37,13 +37,13 @@ The fact that you are presently reading this means that you have had
knowledge of the CeCILL license and that you accept its terms.
/**
- * Class TMLComponentTaskDiagramPanel
- * Panel for drawing TML component-tasks
- * Creation: 10/03/2008
- * @version 1.0 10/03/2008
- * @author Ludovic APVRILLE, Andrea ENRICI
- * @see
- */
+* Class TMLComponentTaskDiagramPanel
+* Panel for drawing TML component-tasks
+* Creation: 10/03/2008
+* @version 1.0 10/03/2008
+* @author Ludovic APVRILLE, Andrea ENRICI
+* @see
+*/
package ui.tmlcompd;
@@ -57,641 +57,643 @@ import java.util.*;
import myutil.*;
public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWithAttributes {
-
- public TMLComponentTaskDiagramPanel(MainGUI mgui, TToolBar _ttb) {
- super(mgui, _ttb);
- /*TDiagramMouseManager tdmm = new TDiagramMouseManager(this);
- addMouseListener(tdmm);
- addMouseMotionListener(tdmm);*/
- //setAttributesVisible(true);
- }
-
- public boolean actionOnDoubleClick(TGComponent tgc) {
- /*System.out.println("Action on double click!");
- if (tgc instanceof TMLCPrimitiveComponent) {
- System.out.println("Action on double click primitive");
- TMLCPrimitiveComponent t = (TMLCPrimitiveComponent)tgc;
- return (t.oldValue.compareTo(t.getValue()) == 0);
- }*/
- return false;
- }
-
- public boolean actionOnAdd(TGComponent tgc) {
- //System.out.println("Action on add! value=" + tgc.getValue());
- if (tgc instanceof TMLCPrimitiveComponent) {
- TMLCPrimitiveComponent tmcpc = (TMLCPrimitiveComponent)(tgc);
- //System.out.println(" *** Add component *** name=" + tmcpc.getValue());
- mgui.addTMLCPrimitiveComponent(tp, tmcpc.getValue());
- return true;
- } /*else if (tgc instanceof TMLCPortConnector) {
- System.out.println("Bringing to front");
- bringToFront(tgc);
- }*/
- //updatePorts();
- if (tgc instanceof TMLCCompositePort) {
- if (tgc.getFather() instanceof TMLCCompositeComponent) {
- getMGUI().updateReferenceToTMLCCompositeComponent((TMLCCompositeComponent)(tgc.getFather()));
- }
+ public TMLComponentTaskDiagramPanel(MainGUI mgui, TToolBar _ttb) {
+ super(mgui, _ttb);
+ /*TDiagramMouseManager tdmm = new TDiagramMouseManager(this);
+ addMouseListener(tdmm);
+ addMouseMotionListener(tdmm);*/
+ //setAttributesVisible(true);
}
- return true;
- }
-
- public boolean actionOnRemove(TGComponent tgc) {
- //System.out.println("Action on remove tgc=" + tgc + " value=" + tgc.getValue());
- if (tgc instanceof TMLCPrimitiveComponent) {
- TMLCPrimitiveComponent tmcpc = (TMLCPrimitiveComponent)(tgc);
- mgui.removeTMLCPrimitiveComponent(tp, tmcpc.getValue());
- //resetAllInstancesOf(tgcc);
- return true;
- }
- if (tgc instanceof TMLCCompositeComponent) {
- TMLCCompositeComponent tmcc = (TMLCCompositeComponent)(tgc);
- ListIterator iterator = tmcc.getAllPrimitiveComponents().listIterator();
- TMLCPrimitiveComponent tmcpc;
- while(iterator.hasNext()) {
- tmcpc = (TMLCPrimitiveComponent)(iterator.next());
- mgui.removeTMLCPrimitiveComponent(tp, tmcpc.getValue());
- }
- //resetAllInstancesOf(tgcc);
- return true;
- }
+ public boolean actionOnDoubleClick(TGComponent tgc) {
+ /*System.out.println("Action on double click!");
+ if (tgc instanceof TMLCPrimitiveComponent) {
+ System.out.println("Action on double click primitive");
+ TMLCPrimitiveComponent t = (TMLCPrimitiveComponent)tgc;
+ return (t.oldValue.compareTo(t.getValue()) == 0);
+ }*/
+
+ return false;
+ }
- if (tgc instanceof TMLCPortConnector) {
- updatePorts();
+ public boolean actionOnAdd(TGComponent tgc) {
+ //System.out.println("Action on add! value=" + tgc.getValue());
+ if (tgc instanceof TMLCPrimitiveComponent) {
+ TMLCPrimitiveComponent tmcpc = (TMLCPrimitiveComponent)(tgc);
+ //System.out.println(" *** Add component *** name=" + tmcpc.getValue());
+ mgui.addTMLCPrimitiveComponent(tp, tmcpc.getValue());
+ return true;
+ } /*else if (tgc instanceof TMLCPortConnector) {
+ System.out.println("Bringing to front");
+ bringToFront(tgc);
+ }*/
+ //updatePorts();
+ if (tgc instanceof TMLCCompositePort) {
+ if (tgc.getFather() instanceof TMLCCompositeComponent) {
+ getMGUI().updateReferenceToTMLCCompositeComponent((TMLCCompositeComponent)(tgc.getFather()));
+ }
+ }
+
+ return true;
}
- if (tgc instanceof TMLCPrimitivePort) {
- updatePorts();
+
+ public boolean actionOnRemove(TGComponent tgc) {
+ //System.out.println("Action on remove tgc=" + tgc + " value=" + tgc.getValue());
+ if (tgc instanceof TMLCPrimitiveComponent) {
+ TMLCPrimitiveComponent tmcpc = (TMLCPrimitiveComponent)(tgc);
+ mgui.removeTMLCPrimitiveComponent(tp, tmcpc.getValue());
+ //resetAllInstancesOf(tgcc);
+ return true;
+ }
+ if (tgc instanceof TMLCCompositeComponent) {
+ TMLCCompositeComponent tmcc = (TMLCCompositeComponent)(tgc);
+ ListIterator iterator = tmcc.getAllPrimitiveComponents().listIterator();
+ TMLCPrimitiveComponent tmcpc;
+ while(iterator.hasNext()) {
+ tmcpc = (TMLCPrimitiveComponent)(iterator.next());
+ mgui.removeTMLCPrimitiveComponent(tp, tmcpc.getValue());
+ }
+ //resetAllInstancesOf(tgcc);
+ return true;
+ }
+
+ if (tgc instanceof TMLCPortConnector) {
+ updatePorts();
+ }
+ if (tgc instanceof TMLCPrimitivePort) {
+ updatePorts();
+ }
+
+ if (tgc instanceof TMLCChannelFacility) {
+ updatePorts();
+ }
+
+ if (tgc instanceof TMLCCompositePort) {
+ //System.out.println("tgc.getFather() = " + tgc.getFather());
+ updatePorts();
+ //System.out.println("fatherOfRemoved = " + fatherOfRemoved);
+ if (fatherOfRemoved instanceof TMLCCompositeComponent) {
+ getMGUI().updateReferenceToTMLCCompositeComponent((TMLCCompositeComponent)(fatherOfRemoved));
+ //System.out.println("Shall do the update");
+ }
+ }
+
+ return true;
}
- if (tgc instanceof TMLCChannelFacility) {
- updatePorts();
+ public boolean actionOnValueChanged(TGComponent tgc) {
+ //System.out.println("Action on value changed on component:" + tgc);
+ if (tgc instanceof TMLCPrimitiveComponent) {
+ TMLCPrimitiveComponent t = (TMLCPrimitiveComponent)tgc;
+ mgui.newTMLTaskName(tp, t.oldValue, t.getValue());
+ return true;
+ }
+ if (tgc instanceof TMLCCompositeComponent) {
+ TMLCCompositeComponent tmlcc = (TMLCCompositeComponent)tgc;
+ getMGUI().updateReferenceToTMLCCompositeComponent(tmlcc);
+ }
+ return true;
}
- if (tgc instanceof TMLCCompositePort) {
- //System.out.println("tgc.getFather() = " + tgc.getFather());
- updatePorts();
- //System.out.println("fatherOfRemoved = " + fatherOfRemoved);
- if (fatherOfRemoved instanceof TMLCCompositeComponent) {
- getMGUI().updateReferenceToTMLCCompositeComponent((TMLCCompositeComponent)(fatherOfRemoved));
- //System.out.println("Shall do the update");
- }
+ public boolean renamePrimitiveComponent(String oldValue, String newValue) {
+ return mgui.newTMLComponentTaskName(tp, oldValue, newValue);
}
- return true;
- }
-
- public boolean actionOnValueChanged(TGComponent tgc) {
- //System.out.println("Action on value changed on component:" + tgc);
- if (tgc instanceof TMLCPrimitiveComponent) {
- TMLCPrimitiveComponent t = (TMLCPrimitiveComponent)tgc;
- mgui.newTMLTaskName(tp, t.oldValue, t.getValue());
- return true;
- }
- if (tgc instanceof TMLCCompositeComponent) {
- TMLCCompositeComponent tmlcc = (TMLCCompositeComponent)tgc;
- getMGUI().updateReferenceToTMLCCompositeComponent(tmlcc);
+ public boolean namePrimitiveComponentInUse(String oldValue, String newValue) {
+ boolean ko = mgui.nameComponentInUse(tp, oldValue, newValue);
+ if (ko == true) {
+ return ko;
+ }
+
+ return nameAllRecordComponentInUse(oldValue, newValue);
}
- return true;
- }
-
- public boolean renamePrimitiveComponent(String oldValue, String newValue) {
- return mgui.newTMLComponentTaskName(tp, oldValue, newValue);
- }
-
- public boolean namePrimitiveComponentInUse(String oldValue, String newValue) {
- boolean ko = mgui.nameComponentInUse(tp, oldValue, newValue);
- if (ko == true) {
- return ko;
+
+ public boolean nameRecordComponentInUse(String oldValue, String newValue) {
+ boolean ko = mgui.nameComponentInUse(tp, oldValue, newValue);
+ if (ko == true) {
+ return ko;
+ }
+
+ return nameAllRecordComponentInUse(oldValue, newValue);
}
- return nameAllRecordComponentInUse(oldValue, newValue);
- }
-
- public boolean nameRecordComponentInUse(String oldValue, String newValue) {
- boolean ko = mgui.nameComponentInUse(tp, oldValue, newValue);
- if (ko == true) {
- return ko;
+ public boolean nameAllRecordComponentInUse(String oldValue, String newValue) {
+ LinkedList ll = getRecordComponentList();
+ ListIterator iterator = ll.listIterator();
+ TMLCRecordComponent record;
+
+ while(iterator.hasNext()) {
+ record = (TMLCRecordComponent)(iterator.next());
+ if (record.getName().compareTo(newValue) == 0) {
+ return true;
+ }
+ }
+
+ return false;
}
- return nameAllRecordComponentInUse(oldValue, newValue);
- }
-
- public boolean nameAllRecordComponentInUse(String oldValue, String newValue) {
- LinkedList ll = getRecordComponentList();
- ListIterator iterator = ll.listIterator();
- TMLCRecordComponent record;
- while(iterator.hasNext()) {
- record = (TMLCRecordComponent)(iterator.next());
- if (record.getName().compareTo(newValue) == 0) {
- return true;
- }
+ public LinkedList getRecordComponentList() {
+ LinkedList ll = new LinkedList();
+ TGComponent tgc;
+
+ Iterator iterator = componentList.listIterator();
+
+ while(iterator.hasNext()) {
+ tgc = (TGComponent)(iterator.next());
+
+ if (tgc instanceof TMLCRecordComponent) {
+ ll.add(tgc);
+ }
+
+ if (tgc instanceof TMLCCompositeComponent) {
+ ll.addAll(((TMLCCompositeComponent)tgc).getAllRecordComponents());
+ }
+
+ if (tgc instanceof TMLCRemoteCompositeComponent) {
+ ll.addAll(((TMLCRemoteCompositeComponent)tgc).getAllRecordComponents());
+ }
+ }
+
+ return ll;
}
- return false;
- }
-
-
- public LinkedList getRecordComponentList() {
- LinkedList ll = new LinkedList();
- TGComponent tgc;
- Iterator iterator = componentList.listIterator();
-
- while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
-
- if (tgc instanceof TMLCRecordComponent) {
- ll.add(tgc);
- }
-
- if (tgc instanceof TMLCCompositeComponent) {
- ll.addAll(((TMLCCompositeComponent)tgc).getAllRecordComponents());
- }
-
- if (tgc instanceof TMLCRemoteCompositeComponent) {
- ll.addAll(((TMLCRemoteCompositeComponent)tgc).getAllRecordComponents());
- }
+ public LinkedList getPrimitiveComponentList() {
+ LinkedList ll = new LinkedList();
+ TGComponent tgc;
+
+ Iterator iterator = componentList.listIterator();
+
+ while(iterator.hasNext()) {
+ tgc = (TGComponent)(iterator.next());
+
+ if (tgc instanceof TMLCPrimitiveComponent) {
+ ll.add(tgc);
+ }
+
+ if (tgc instanceof TMLCCompositeComponent) {
+ ll.addAll(((TMLCCompositeComponent)tgc).getAllPrimitiveComponents());
+ }
+
+ if (tgc instanceof TMLCRemoteCompositeComponent) {
+ ll.addAll(((TMLCRemoteCompositeComponent)tgc).getAllPrimitiveComponents());
+ }
+ }
+
+ return ll;
}
- return ll;
- }
-
-
- public LinkedList getPrimitiveComponentList() {
- LinkedList ll = new LinkedList();
- TGComponent tgc;
+ public LinkedList getPortsConnectedTo(TMLCPrimitivePort _port, LinkedList componentsToTakeIntoAccount) {
+ LinkedList ll;
+ LinkedList ret = new LinkedList();
+ Object o;
+ TMLCPrimitivePort p;
+
+ ll = getAllPortsConnectedTo(_port);
+ ListIterator li = ll.listIterator();
+
+ while(li.hasNext()) {
+ o = li.next();
+ if (o instanceof TMLCPrimitivePort) {
+ p = (TMLCPrimitivePort)o;
+ if (p.getFather() != null) {
+ if (p.getFather() instanceof TMLCPrimitiveComponent) {
+ if (componentsToTakeIntoAccount.contains(p.getFather())) {
+ TraceManager.addDev("-> port " + _port + " is connected to " + o);
+ ret.add(o);
+ }
+ }
+ }
+ }
+ }
+
+ return ret;
+ }
- Iterator iterator = componentList.listIterator();
-
- while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
-
- if (tgc instanceof TMLCPrimitiveComponent) {
- ll.add(tgc);
- }
-
- if (tgc instanceof TMLCCompositeComponent) {
- ll.addAll(((TMLCCompositeComponent)tgc).getAllPrimitiveComponents());
- }
-
- if (tgc instanceof TMLCRemoteCompositeComponent) {
- ll.addAll(((TMLCRemoteCompositeComponent)tgc).getAllPrimitiveComponents());
- }
+ public LinkedList getAllPortsConnectedTo(TMLCPrimitivePort _port) {
+ LinkedList ll = new LinkedList();
+ getAllPortsConnectedTo(ll, _port);
+ return ll;
}
- return ll;
- }
-
- public LinkedList getPortsConnectedTo(TMLCPrimitivePort _port, LinkedList componentsToTakeIntoAccount) {
- LinkedList ll;
- LinkedList ret = new LinkedList();
- Object o;
- TMLCPrimitivePort p;
+ public ArrayList<String> getAllTMLCommunicationNames(String _topname) {
+ ArrayList<String> al = new ArrayList<String>();
+
+ TGComponent tgc;
+ TMLCPrimitiveComponent tmlc;
+ LinkedList components = getPrimitiveComponentList();
+ ListIterator iterator = components.listIterator();
+ ListIterator li, li2;
+ LinkedList ports, portstome;
+ String name, name1, name2;
+ TMLCPrimitivePort port1, port2;
+
+ int j;
+
+ //TMLTaskInterface t1, t2;
+ //TMLChannel channel;
+ //TMLTask tt1, tt2;
+
+ //TraceManager.addDev("*** Adding channels ***");
+
+ while( iterator.hasNext() ) {
+ tgc = ( TGComponent )( iterator.next() );
+ if( tgc instanceof TMLCPrimitiveComponent ) {
+ tmlc = ( TMLCPrimitiveComponent )tgc;
+ //TraceManager.addDev("Component:" + tmlc.getValue());
+ ports = tmlc.getAllChannelsOriginPorts();
+ //TraceManager.addDev("Ports size:" + ports.size());
+ li = ports.listIterator();
+ while( li.hasNext() ) {
+ port1 = (TMLCPrimitivePort)( li.next() );
+ portstome = getPortsConnectedTo( port1, components );
+ //TraceManager.addDev("Considering port1 = " +port1.getPortName() + " size of connecting ports:" + portstome.size());
+
+ ListIterator ite = portstome.listIterator();
+ while( ite.hasNext()) {
+ //if ( portstome.size() == 1 ) {
+ //TraceManager.addDev("port=" + ((TMLCPrimitivePort)(ite.next())).getPortName());
+ port2 = ( TMLCPrimitivePort )(ite.next());
+ if (!port2.isOrigin()) {
+ String []text1 = port1.getPortName().split( "," );
+ String []text2 = port2.getPortName().split( "," );
+ for ( j = 0; j < Math.min( text1.length, text2.length ); j++ ) {
+ name1 = text1[j].trim();
+ name2 = text2[j].trim();
+ if( name1.equals( name2 ) ) {
+ name = name1;
+ }
+ else {
+ name = name1 + "__" + name2;
+ }
+ al.add( _topname + "::" + name );
+ }
+ }
+ }
+ }
+ }
+ }
+ return al;
+ }
- ll = getAllPortsConnectedTo(_port);
- ListIterator li = ll.listIterator();
+ public ArrayList<String> getAllTMLEventNames( String _topname ) {
+
+ ArrayList<String> al = new ArrayList<String>();
+ TGComponent tgc;
+ TMLCPrimitiveComponent tmlc;
+ LinkedList components = getPrimitiveComponentList();
+ ListIterator iterator = components.listIterator();
+ ListIterator li, li2;
+ LinkedList ports, portstome;
+ String name, name1, name2;
+ TMLCPrimitivePort port1, port2;
+ int j;
+
+ while( iterator.hasNext() ) {
+ tgc = ( TGComponent )( iterator.next() );
+ if( tgc instanceof TMLCPrimitiveComponent ) {
+ tmlc = ( TMLCPrimitiveComponent )tgc;
+ //TraceManager.addDev("Component:" + tmlc.getValue());
+ ports = tmlc.getAllEventsOriginPorts();
+ //TraceManager.addDev("Ports size:" + ports.size());
+ li = ports.listIterator();
+ while( li.hasNext() ) {
+ port1 = (TMLCPrimitivePort)( li.next() );
+ portstome = getPortsConnectedTo( port1, components );
+ //TraceManager.addDev("Considering port1 = " +port1.getPortName() + " size of connecting ports:" + portstome.size());
+ ListIterator ite = portstome.listIterator();
+ //while(ite.hasNext()) {
+ //TraceManager.addDev("port=" + ((TMLCPrimitivePort)(ite.next())).getPortName());
+ //}
+ if ( portstome.size() == 1 ) {
+ port2 = ( TMLCPrimitivePort )( portstome.get(0) );
+ String []text1 = port1.getPortName().split( "," );
+ String []text2 = port2.getPortName().split( "," );
+ for ( j = 0; j < Math.min( text1.length, text2.length ); j++ ) {
+ name1 = text1[j].trim();
+ name2 = text2[j].trim();
+ if( name1.equals( name2 ) ) {
+ name = name1;
+ }
+ else {
+ name = name1 + "__" + name2;
+ }
+ al.add( _topname + "::" + name );
+ }
+ }
+ }
+ }
+ }
+ return al;
+ }
- while(li.hasNext()) {
- o = li.next();
- if (o instanceof TMLCPrimitivePort) {
- p = (TMLCPrimitivePort)o;
- if (p.getFather() != null) {
- if (p.getFather() instanceof TMLCPrimitiveComponent) {
- if (componentsToTakeIntoAccount.contains(p.getFather())) {
- ret.add(o);
+ public void getAllPortsConnectedTo(LinkedList ll, TMLCPrimitivePort _port) {
+ LinkedList components = getMGUI().getAllTMLComponents();
+ ListIterator iterator = components.listIterator();
+ TGComponent tgc, tgc1, tgc2;
+ TMLCPortConnector portco;
+
+ while(iterator.hasNext()) {
+ tgc = (TGComponent)(iterator.next());
+ if (tgc instanceof TMLCPortConnector) {
+ portco = (TMLCPortConnector)tgc;
+ //System.out.println("portco");
+ tgc1 = getComponentToWhichBelongs(components, portco.getTGConnectingPointP1());
+ tgc2 = getComponentToWhichBelongs(components, portco.getTGConnectingPointP2());
+ if ((tgc1 != null) && (tgc2 != null)) {
+ //TraceManager.addDev("tgc1=" + tgc1 + " tgc2=" + tgc2);
+
+ if (tgc1 instanceof TMLCRemoteCompositeComponent) {
+ tgc1 = ((TMLCRemoteCompositeComponent)tgc1).getPortOf(portco.getTGConnectingPointP1());
+ }
+
+ if (tgc2 instanceof TMLCRemoteCompositeComponent) {
+ tgc2 = ((TMLCRemoteCompositeComponent)tgc2).getPortOf(portco.getTGConnectingPointP2());
+ }
+
+ //System.out.println("tgc1=" + tgc1 + " tgc2=" + tgc2);
+
+ if ((!ll.contains(tgc2) && (tgc2 != _port) && ((tgc1 == _port) || (ll.contains(tgc1))))) {
+ ll.add(tgc2);
+ iterator = components.listIterator();
+ } else {
+ if ((!ll.contains(tgc1) && (tgc1 != _port) && ((tgc2 == _port) || (ll.contains(tgc2))))) {
+ ll.add(tgc1);
+ iterator = components.listIterator();
+ }
+ }
+ }
}
- }
}
- }
}
- return ret;
- }
-
- public LinkedList getAllPortsConnectedTo(TMLCPrimitivePort _port) {
- LinkedList ll = new LinkedList();
- getAllPortsConnectedTo(ll, _port);
- return ll;
- }
-
- public ArrayList<String> getAllTMLCommunicationNames(String _topname) {
- ArrayList<String> al = new ArrayList<String>();
+ public String getXMLHead() {
+ //System.out.println("Name=" + name);
+ return "<TMLComponentTaskDiagramPanel name=\"" + name + "\"" + sizeParam() + displayParam() + zoomParam() +" >";
+ }
- TGComponent tgc;
- TMLCPrimitiveComponent tmlc;
- LinkedList components = getPrimitiveComponentList();
- ListIterator iterator = components.listIterator();
- ListIterator li, li2;
- LinkedList ports, portstome;
- String name, name1, name2;
- TMLCPrimitivePort port1, port2;
+ public String getXMLTail() {
+ return "</TMLComponentTaskDiagramPanel>";
+ }
- int j;
+ public String getXMLSelectedHead() {
+ return "<TMLComponentTaskDiagramPanelCopy name=\"" + name + "\" xSel=\"" + xSel + "\" ySel=\"" + ySel + "\" widthSel=\"" + widthSel + "\" heightSel=\"" + heightSel + "\" >";
+ }
- //TMLTaskInterface t1, t2;
- //TMLChannel channel;
- //TMLTask tt1, tt2;
-
- //TraceManager.addDev("*** Adding channels ***");
+ public String getXMLSelectedTail() {
+ return "</TMLComponentTaskDiagramPanelCopy>";
+ }
- while( iterator.hasNext() ) {
- tgc = ( TGComponent )( iterator.next() );
- if( tgc instanceof TMLCPrimitiveComponent ) {
- tmlc = ( TMLCPrimitiveComponent )tgc;
- //TraceManager.addDev("Component:" + tmlc.getValue());
- ports = tmlc.getAllChannelsOriginPorts();
- //TraceManager.addDev("Ports size:" + ports.size());
- li = ports.listIterator();
- while( li.hasNext() ) {
- port1 = (TMLCPrimitivePort)( li.next() );
- portstome = getPortsConnectedTo( port1, components );
- //TraceManager.addDev("Considering port1 = " +port1.getPortName() + " size of connecting ports:" + portstome.size());
-
- ListIterator ite = portstome.listIterator();
- //while(ite.hasNext()) {
- //TraceManager.addDev("port=" + ((TMLCPrimitivePort)(ite.next())).getPortName());
- //}
- if ( portstome.size() == 1 ) {
- port2 = ( TMLCPrimitivePort )( portstome.get(0) );
- String []text1 = port1.getPortName().split( "," );
- String []text2 = port2.getPortName().split( "," );
- for ( j = 0; j < Math.min( text1.length, text2.length ); j++ ) {
- name1 = text1[j].trim();
- name2 = text2[j].trim();
- if( name1.equals( name2 ) ) {
- name = name1;
- }
- else {
- name = name1 + "__" + name2;
- }
- al.add( _topname + "::" + name );
- }
- }
- }
- }
- }
- return al;
- }
-
- public ArrayList<String> getAllTMLEventNames( String _topname ) {
+ public String getXMLCloneHead() {
+ return "<TMLComponentTaskDiagramPanelCopy name=\"" + name + "\" xSel=\"" + 0 + "\" ySel=\"" + 0 + "\" widthSel=\"" + 0 + "\" heightSel=\"" + 0 + "\" >";
+ }
- ArrayList<String> al = new ArrayList<String>();
- TGComponent tgc;
- TMLCPrimitiveComponent tmlc;
- LinkedList components = getPrimitiveComponentList();
- ListIterator iterator = components.listIterator();
- ListIterator li, li2;
- LinkedList ports, portstome;
- String name, name1, name2;
- TMLCPrimitivePort port1, port2;
- int j;
+ public String getXMLCloneTail() {
+ return "</TMLComponentTaskDiagramPanelCopy>";
+ }
- while( iterator.hasNext() ) {
- tgc = ( TGComponent )( iterator.next() );
- if( tgc instanceof TMLCPrimitiveComponent ) {
- tmlc = ( TMLCPrimitiveComponent )tgc;
- //TraceManager.addDev("Component:" + tmlc.getValue());
- ports = tmlc.getAllEventsOriginPorts();
- //TraceManager.addDev("Ports size:" + ports.size());
- li = ports.listIterator();
- while( li.hasNext() ) {
- port1 = (TMLCPrimitivePort)( li.next() );
- portstome = getPortsConnectedTo( port1, components );
- //TraceManager.addDev("Considering port1 = " +port1.getPortName() + " size of connecting ports:" + portstome.size());
- ListIterator ite = portstome.listIterator();
- //while(ite.hasNext()) {
- //TraceManager.addDev("port=" + ((TMLCPrimitivePort)(ite.next())).getPortName());
- //}
- if ( portstome.size() == 1 ) {
- port2 = ( TMLCPrimitivePort )( portstome.get(0) );
- String []text1 = port1.getPortName().split( "," );
- String []text2 = port2.getPortName().split( "," );
- for ( j = 0; j < Math.min( text1.length, text2.length ); j++ ) {
- name1 = text1[j].trim();
- name2 = text2[j].trim();
- if( name1.equals( name2 ) ) {
- name = name1;
- }
- else {
- name = name1 + "__" + name2;
- }
- al.add( _topname + "::" + name );
- }
- }
- }
- }
+
+
+ public boolean areAttributesVisible() {
+ return attributesVisible;
}
- return al;
- }
-
- public void getAllPortsConnectedTo(LinkedList ll, TMLCPrimitivePort _port) {
- LinkedList components = getMGUI().getAllTMLComponents();
- ListIterator iterator = components.listIterator();
- TGComponent tgc, tgc1, tgc2;
- TMLCPortConnector portco;
- while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
- if (tgc instanceof TMLCPortConnector) {
- portco = (TMLCPortConnector)tgc;
- //System.out.println("portco");
- tgc1 = getComponentToWhichBelongs(components, portco.getTGConnectingPointP1());
- tgc2 = getComponentToWhichBelongs(components, portco.getTGConnectingPointP2());
- if ((tgc1 != null) && (tgc2 != null)) {
- //System.out.println("tgc1=" + tgc1 + " tgc2=" + tgc2);
-
- if (tgc1 instanceof TMLCRemoteCompositeComponent) {
- tgc1 = ((TMLCRemoteCompositeComponent)tgc1).getPortOf(portco.getTGConnectingPointP1());
- }
-
- if (tgc2 instanceof TMLCRemoteCompositeComponent) {
- tgc2 = ((TMLCRemoteCompositeComponent)tgc2).getPortOf(portco.getTGConnectingPointP2());
- }
-
- //System.out.println("tgc1=" + tgc1 + " tgc2=" + tgc2);
-
- if ((!ll.contains(tgc2) && (tgc2 != _port) && ((tgc1 == _port) || (ll.contains(tgc1))))) {
- ll.add(tgc2);
- iterator = components.listIterator();
- } else {
- if ((!ll.contains(tgc1) && (tgc1 != _port) && ((tgc2 == _port) || (ll.contains(tgc2))))) {
- ll.add(tgc1);
- iterator = components.listIterator();
- }
- }
- }
- }
+
+ public boolean areChannelVisible() {
+ return synchroVisible;
}
- }
-
- public String getXMLHead() {
- //System.out.println("Name=" + name);
- return "<TMLComponentTaskDiagramPanel name=\"" + name + "\"" + sizeParam() + displayParam() + zoomParam() +" >";
- }
-
- public String getXMLTail() {
- return "</TMLComponentTaskDiagramPanel>";
- }
-
- public String getXMLSelectedHead() {
- return "<TMLComponentTaskDiagramPanelCopy name=\"" + name + "\" xSel=\"" + xSel + "\" ySel=\"" + ySel + "\" widthSel=\"" + widthSel + "\" heightSel=\"" + heightSel + "\" >";
- }
-
- public String getXMLSelectedTail() {
- return "</TMLComponentTaskDiagramPanelCopy>";
- }
-
- public String getXMLCloneHead() {
- return "<TMLComponentTaskDiagramPanelCopy name=\"" + name + "\" xSel=\"" + 0 + "\" ySel=\"" + 0 + "\" widthSel=\"" + 0 + "\" heightSel=\"" + 0 + "\" >";
- }
-
- public String getXMLCloneTail() {
- return "</TMLComponentTaskDiagramPanelCopy>";
- }
-
-
-
- public boolean areAttributesVisible() {
- return attributesVisible;
- }
-
-
- public boolean areChannelVisible() {
- return synchroVisible;
- }
-
- public void setAttributesVisible(boolean b) {
- attributesVisible = b;
- }
-
-
- public void setChannelVisible(boolean b) {
- channelVisible = b;
- }
-
- public String displayParam() {
- String s = "";
- if (channelsVisible) {
- s += " channels=\"true\"";
- } else {
- s += " channels=\"false\"";
- }
- if (eventsVisible) {
- s += " events=\"true\"";
- } else {
- s += " events=\"false\"";
- }
- if (requestsVisible) {
- s += " requests=\"true\"";
- } else {
- s += " requests=\"false\"";
- }
-
- return s;
- }
-
- public ArrayList<String> getAllNonMappedTMLPrimitiveComponentNames(String _topName, TMLArchiDiagramPanel _tadp, boolean ref, String _name) {
- TGComponent tgc;
- Iterator iterator = componentList.listIterator();
- ArrayList<String> list = new ArrayList<String>();
- String name;
-
- while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
- if (tgc instanceof TMLCPrimitiveComponent) {
- addNonMappedTMLPritimiveComponentsNames((TMLCPrimitiveComponent)tgc, list, _topName, _tadp, ref, _name);
- }
- if (tgc instanceof TMLCCompositeComponent) {
- getAllNonMappedTMLPrimitiveComponentNamesByComponent(tgc, list, _topName, _tadp, ref, _name);
- }
- }
- return list;
- }
-
- public void getAllNonMappedTMLPrimitiveComponentNamesByComponent(TGComponent tgc, ArrayList<String> list, String _topName, TMLArchiDiagramPanel _tadp, boolean ref, String _name) {
- TGComponent tgc1;
- for(int i=0; i<tgc.getNbInternalTGComponent(); i++) {
- tgc1 = tgc.getInternalTGComponent(i) ;
- if (tgc1 instanceof TMLCPrimitiveComponent) {
- addNonMappedTMLPritimiveComponentsNames((TMLCPrimitiveComponent)tgc1, list, _topName, _tadp, ref, _name);
- }
- if (tgc1 instanceof TMLCCompositeComponent) {
- getAllNonMappedTMLPrimitiveComponentNamesByComponent(tgc1, list, _topName, _tadp, ref, _name);
- }
+ public void setAttributesVisible(boolean b) {
+ attributesVisible = b;
}
- }
-
- public ArrayList<String> getAllCompositeComponent(String _name) {
- ArrayList<String> list = new ArrayList<String>();
- TGComponent tgc1;
- String s;
- TMLCCompositeComponent tmlcc;
- Iterator iterator = componentList.listIterator();
- while(iterator.hasNext()) {
- tgc1 = (TGComponent)(iterator.next());
-
- if (tgc1 instanceof TMLCCompositeComponent) {
- tmlcc = (TMLCCompositeComponent)tgc1;
- s = _name + "::" + tmlcc.getValue();
- list.add(s);
- tmlcc.getAllCompositeComponents(list, _name);
- }
+
+ public void setChannelVisible(boolean b) {
+ channelVisible = b;
}
- return list;
- }
-
- public void addNonMappedTMLPritimiveComponentsNames(TMLCPrimitiveComponent tgc, ArrayList<String> list, String _topName, TMLArchiDiagramPanel _tadp, boolean ref, String _name) {
- String name1 = tgc.getValue();
- if (ref && name1.equals(_name)) {
- list.add(_topName + "::" + name1);
- } else {
- if (!_tadp.isMapped(_topName, name1)) {
- list.add(_topName + "::" + name1);
- }
+ public String displayParam() {
+ String s = "";
+ if (channelsVisible) {
+ s += " channels=\"true\"";
+ } else {
+ s += " channels=\"false\"";
+ }
+ if (eventsVisible) {
+ s += " events=\"true\"";
+ } else {
+ s += " events=\"false\"";
+ }
+ if (requestsVisible) {
+ s += " requests=\"true\"";
+ } else {
+ s += " requests=\"false\"";
+ }
+
+ return s;
}
- }
-
- public TMLCPrimitiveComponent getPrimitiveComponentByName(String _name) {
- TGComponent tgc;
- Iterator iterator = componentList.listIterator();
- ArrayList<String> list = new ArrayList<String>();
- TMLCPrimitiveComponent tmp;
-
- while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
- if (tgc instanceof TMLCPrimitiveComponent) {
- if (((TMLCPrimitiveComponent)tgc).getValue().equals(_name)) {
- return ((TMLCPrimitiveComponent)tgc);
+
+ public ArrayList<String> getAllNonMappedTMLPrimitiveComponentNames(String _topName, TMLArchiDiagramPanel _tadp, boolean ref, String _name) {
+ TGComponent tgc;
+ Iterator iterator = componentList.listIterator();
+ ArrayList<String> list = new ArrayList<String>();
+ String name;
+
+ while(iterator.hasNext()) {
+ tgc = (TGComponent)(iterator.next());
+ if (tgc instanceof TMLCPrimitiveComponent) {
+ addNonMappedTMLPritimiveComponentsNames((TMLCPrimitiveComponent)tgc, list, _topName, _tadp, ref, _name);
+ }
+ if (tgc instanceof TMLCCompositeComponent) {
+ getAllNonMappedTMLPrimitiveComponentNamesByComponent(tgc, list, _topName, _tadp, ref, _name);
+ }
}
- }
-
- if (tgc instanceof TMLCCompositeComponent) {
- tmp = ((TMLCCompositeComponent)tgc).getPrimitiveComponentByName(_name);
- if (tmp != null) {
- return tmp;
+ return list;
+ }
+
+ public void getAllNonMappedTMLPrimitiveComponentNamesByComponent(TGComponent tgc, ArrayList<String> list, String _topName, TMLArchiDiagramPanel _tadp, boolean ref, String _name) {
+ TGComponent tgc1;
+
+ for(int i=0; i<tgc.getNbInternalTGComponent(); i++) {
+ tgc1 = tgc.getInternalTGComponent(i) ;
+ if (tgc1 instanceof TMLCPrimitiveComponent) {
+ addNonMappedTMLPritimiveComponentsNames((TMLCPrimitiveComponent)tgc1, list, _topName, _tadp, ref, _name);
+ }
+ if (tgc1 instanceof TMLCCompositeComponent) {
+ getAllNonMappedTMLPrimitiveComponentNamesByComponent(tgc1, list, _topName, _tadp, ref, _name);
+ }
}
- }
-
- if (tgc instanceof TMLCRemoteCompositeComponent) {
- tmp = ((TMLCRemoteCompositeComponent)tgc).getPrimitiveComponentByName(_name);
- if (tmp != null) {
- return tmp;
+ }
+
+ public ArrayList<String> getAllCompositeComponent(String _name) {
+ ArrayList<String> list = new ArrayList<String>();
+ TGComponent tgc1;
+ String s;
+ TMLCCompositeComponent tmlcc;
+ Iterator iterator = componentList.listIterator();
+
+ while(iterator.hasNext()) {
+ tgc1 = (TGComponent)(iterator.next());
+
+ if (tgc1 instanceof TMLCCompositeComponent) {
+ tmlcc = (TMLCCompositeComponent)tgc1;
+ s = _name + "::" + tmlcc.getValue();
+ list.add(s);
+ tmlcc.getAllCompositeComponents(list, _name);
+ }
}
- }
- }
+
+ return list;
+ }
- return null;
- }
-
- public void updateReferenceToTMLCCompositeComponent(TMLCCompositeComponent tmlcc) {
- //System.out.println("Update from " + tmlcc.getValue());
- Iterator iterator = componentList.listIterator();
- TGComponent tgc;
+ public void addNonMappedTMLPritimiveComponentsNames(TMLCPrimitiveComponent tgc, ArrayList<String> list, String _topName, TMLArchiDiagramPanel _tadp, boolean ref, String _name) {
+ String name1 = tgc.getValue();
+ if (ref && name1.equals(_name)) {
+ list.add(_topName + "::" + name1);
+ } else {
+ if (!_tadp.isMapped(_topName, name1)) {
+ list.add(_topName + "::" + name1);
+ }
+ }
+ }
- while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
- if (tgc instanceof TMLCCompositeComponent) {
- ((TMLCCompositeComponent)tgc).updateReferenceToTMLCCompositeComponent(tmlcc);
- }
-
- if (tgc instanceof TMLCRemoteCompositeComponent) {
- ((TMLCRemoteCompositeComponent)tgc).updateReference(tmlcc);
- }
- }
- }
-
- public TMLCCompositeComponent getCompositeComponentByName(String _name) {
- TGComponent tgc;
- Iterator iterator = componentList.listIterator();
- TMLCCompositeComponent tmp;
-
- while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
- if (tgc instanceof TMLCCompositeComponent) {
- tmp = (TMLCCompositeComponent)tgc;
- if (tmp.getValue().equals(_name)) {
- return tmp;
+ public TMLCPrimitiveComponent getPrimitiveComponentByName(String _name) {
+ TGComponent tgc;
+ Iterator iterator = componentList.listIterator();
+ ArrayList<String> list = new ArrayList<String>();
+ TMLCPrimitiveComponent tmp;
+
+ while(iterator.hasNext()) {
+ tgc = (TGComponent)(iterator.next());
+ if (tgc instanceof TMLCPrimitiveComponent) {
+ if (((TMLCPrimitiveComponent)tgc).getValue().equals(_name)) {
+ return ((TMLCPrimitiveComponent)tgc);
+ }
+ }
+
+ if (tgc instanceof TMLCCompositeComponent) {
+ tmp = ((TMLCCompositeComponent)tgc).getPrimitiveComponentByName(_name);
+ if (tmp != null) {
+ return tmp;
+ }
+ }
+
+ if (tgc instanceof TMLCRemoteCompositeComponent) {
+ tmp = ((TMLCRemoteCompositeComponent)tgc).getPrimitiveComponentByName(_name);
+ if (tmp != null) {
+ return tmp;
+ }
+ }
+ }
+
+ return null;
+ }
+
+ public void updateReferenceToTMLCCompositeComponent(TMLCCompositeComponent tmlcc) {
+ //System.out.println("Update from " + tmlcc.getValue());
+ Iterator iterator = componentList.listIterator();
+ TGComponent tgc;
+
+ while(iterator.hasNext()) {
+ tgc = (TGComponent)(iterator.next());
+ if (tgc instanceof TMLCCompositeComponent) {
+ ((TMLCCompositeComponent)tgc).updateReferenceToTMLCCompositeComponent(tmlcc);
+ }
+
+ if (tgc instanceof TMLCRemoteCompositeComponent) {
+ ((TMLCRemoteCompositeComponent)tgc).updateReference(tmlcc);
+ }
}
+ }
+
+ public TMLCCompositeComponent getCompositeComponentByName(String _name) {
+ TGComponent tgc;
+ Iterator iterator = componentList.listIterator();
+ TMLCCompositeComponent tmp;
- if ((tmp = tmp.getCompositeComponentByName(name)) != null) {
- return tmp;
+ while(iterator.hasNext()) {
+ tgc = (TGComponent)(iterator.next());
+ if (tgc instanceof TMLCCompositeComponent) {
+ tmp = (TMLCCompositeComponent)tgc;
+ if (tmp.getValue().equals(_name)) {
+ return tmp;
+ }
+
+ if ((tmp = tmp.getCompositeComponentByName(name)) != null) {
+ return tmp;
+ }
+ }
}
- }
- }
+
+ return null;
+ }
- return null;
- }
-
- public void hideConnectors() {
- Iterator iterator = componentList.listIterator();
- TMLCPortConnector connector;
- TGComponent tgc;
- TGComponent tgc1;
- TGComponent tgc2;
-
- while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
- if (tgc instanceof TMLCPortConnector) {
- connector = (TMLCPortConnector) tgc;
- tgc1 = getComponentToWhichBelongs(connector.getTGConnectingPointP1());
- tgc2 = getComponentToWhichBelongs(connector.getTGConnectingPointP2());
- if ((tgc1 != null) && (tgc2 != null)) {
- if (tgc1.hasAnHiddenAncestor()) {
- tgc.setHidden(true);
- } else {
- if (tgc2.hasAnHiddenAncestor()) {
- tgc.setHidden(true);
- } else {
- tgc.setHidden(false);
+ public void hideConnectors() {
+ Iterator iterator = componentList.listIterator();
+ TMLCPortConnector connector;
+ TGComponent tgc;
+ TGComponent tgc1;
+ TGComponent tgc2;
+
+ while(iterator.hasNext()) {
+ tgc = (TGComponent)(iterator.next());
+ if (tgc instanceof TMLCPortConnector) {
+ connector = (TMLCPortConnector) tgc;
+ tgc1 = getComponentToWhichBelongs(connector.getTGConnectingPointP1());
+ tgc2 = getComponentToWhichBelongs(connector.getTGConnectingPointP2());
+ if ((tgc1 != null) && (tgc2 != null)) {
+ if (tgc1.hasAnHiddenAncestor()) {
+ tgc.setHidden(true);
+ } else {
+ if (tgc2.hasAnHiddenAncestor()) {
+ tgc.setHidden(true);
+ } else {
+ tgc.setHidden(false);
+ }
+ }
+ }
}
- }
}
- }
- }
- }
-
- /*public boolean isConnectedToTasks(TMLCompositionOperator co) {
+ }
+
+ /*public boolean isConnectedToTasks(TMLCompositionOperator co) {
if ((getTask1ToWhichIamConnected(co) != null) && (getTask2ToWhichIamConnected(co) != null)) {
- return true;
+ return true;
}
return false;
- }*/
-
- /*public TMLTaskInterface getTask1ToWhichIamConnected(TMLCompositionOperator co) {
+ }*/
+
+ /*public TMLTaskInterface getTask1ToWhichIamConnected(TMLCompositionOperator co) {
TGConnectorTMLAssociationNav tgctmlan = getTGConnectorAssociationOf(co);
TGComponent tgc;
//System.out.println("tmlan t1?");
if (tgctmlan != null) {
- //System.out.println("tmlan found t1");
- tgc = getTopComponentToWhichBelongs(tgctmlan.getTGConnectingPointP1());
- if ((tgc != null) && (tgc instanceof TMLTaskInterface)) {
- return (TMLTaskInterface) tgc;
- }
+ //System.out.println("tmlan found t1");
+ tgc = getTopComponentToWhichBelongs(tgctmlan.getTGConnectingPointP1());
+ if ((tgc != null) && (tgc instanceof TMLTaskInterface)) {
+ return (TMLTaskInterface) tgc;
+ }
}
return null;
- }
-
- public TMLTaskInterface getTask2ToWhichIamConnected(TMLCompositionOperator co) {
+ }
+
+ public TMLTaskInterface getTask2ToWhichIamConnected(TMLCompositionOperator co) {
TGConnectorTMLAssociationNav tgctmlan = getTGConnectorAssociationOf(co);
TGComponent tgc;
//System.out.println("tmlan t2?");
if (tgctmlan != null) {
- //System.out.println("tmlan found t2");
- tgc = getTopComponentToWhichBelongs(tgctmlan.getTGConnectingPointP2());
- if ((tgc != null) && (tgc instanceof TMLTaskInterface)) {
- return (TMLTaskInterface) tgc;
- }
+ //System.out.println("tmlan found t2");
+ tgc = getTopComponentToWhichBelongs(tgctmlan.getTGConnectingPointP2());
+ if ((tgc != null) && (tgc instanceof TMLTaskInterface)) {
+ return (TMLTaskInterface) tgc;
+ }
}
return null;
- }*/
-
- /*public TGConnectorTMLAssociationNav getTGConnectorAssociationOf(TMLCompositionOperator tcd) {
+ }*/
+
+ /*public TGConnectorTMLAssociationNav getTGConnectorAssociationOf(TMLCompositionOperator tcd) {
int i;
TGConnectingPoint p1, p2;
TGConnector tgco;
@@ -699,478 +701,478 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
TGComponent tgc;
for(i=0; i<tcd.getNbConnectingPoint(); i++) {
- //System.out.println("titi");
- p1 = tcd.tgconnectingPointAtIndex(i);
- tgco = getConnectorConnectedTo(p1);
- if (tgco != null) {
- //System.out.println("Found tgco");
- }
- if ((tgco != null) && (tgco instanceof TGConnectorTMLCompositionOperator)){
- //System.out.println("toto");
- tgcoco = (TGConnectorTMLCompositionOperator)tgco;
- if (p1 == tgcoco.getTGConnectingPointP1()) {
- p2 = tgcoco.getTGConnectingPointP2();
- } else {
- p2 = tgcoco.getTGConnectingPointP1();
- }
-
- // p2 now contains the connecting point of a association
- tgc = getComponentToWhichBelongs(p2);
- if ((tgc != null) && (!p2.isFree()) && (tgc instanceof TGConnectorTMLAssociationNav)) {
- //System.out.println("tutu");
- return (TGConnectorTMLAssociationNav)tgc;
- }
- }
+ //System.out.println("titi");
+ p1 = tcd.tgconnectingPointAtIndex(i);
+ tgco = getConnectorConnectedTo(p1);
+ if (tgco != null) {
+ //System.out.println("Found tgco");
+ }
+ if ((tgco != null) && (tgco instanceof TGConnectorTMLCompositionOperator)){
+ //System.out.println("toto");
+ tgcoco = (TGConnectorTMLCompositionOperator)tgco;
+ if (p1 == tgcoco.getTGConnectingPointP1()) {
+ p2 = tgcoco.getTGConnectingPointP2();
+ } else {
+ p2 = tgcoco.getTGConnectingPointP1();
+ }
+
+ // p2 now contains the connecting point of a association
+ tgc = getComponentToWhichBelongs(p2);
+ if ((tgc != null) && (!p2.isFree()) && (tgc instanceof TGConnectorTMLAssociationNav)) {
+ //System.out.println("tutu");
+ return (TGConnectorTMLAssociationNav)tgc;
+ }
+ }
}
return null;
- }*/
-
- /*public boolean connectedToVisible(TGConnectorTMLAssociationNav tgconav) {
+ }*/
+
+ /*public boolean connectedToVisible(TGConnectorTMLAssociationNav tgconav) {
TGConnectorTMLCompositionOperator tgcoco = tgconav.getTGConnectorTMLCompositionOperator();
if (tgcoco == null) {
- return true;
+ return true;
}
return connectedToVisible(tgcoco);
- }
-
- public boolean connectedToVisible(TGConnectorTMLCompositionOperator tgcoco) {
+ }
+
+ public boolean connectedToVisible(TGConnectorTMLCompositionOperator tgcoco) {
TGConnectingPoint p2 = tgcoco.getTGConnectingPointP2();
TGComponent tgc = getComponentToWhichBelongs(p2);
if (tgc instanceof TMLCompositionOperator) {
- return ((TMLCompositionOperator)tgc).isToggledVisible();
+ return ((TMLCompositionOperator)tgc).isToggledVisible();
}
return false;
- }*/
-
-
- public boolean areAllVisible() {
- return channelsVisible && eventsVisible && requestsVisible;
- }
-
- public boolean areChannelsVisible() {
- return channelsVisible;
- }
-
- public boolean areEventsVisible() {
- return eventsVisible;
- }
-
- public boolean areRequestsVisible() {
- return requestsVisible;
- }
-
- public void setChannelsVisible(boolean b) {
- channelsVisible = b;
- }
-
- public void setEventsVisible(boolean b) {
- eventsVisible = b;
- }
-
- public void setRequestsVisible(boolean b) {
- requestsVisible = b;
- }
-
- public void loadExtraParameters(Element elt) {
- String s;
- //System.out.println("Extra parameter");
- try {
- s = elt.getAttribute("channels");
- //System.out.println("S=" + s);
- if (s.compareTo("false") ==0) {
- setChannelsVisible(false);
- } else {
- setChannelsVisible(true);
- }
- s = elt.getAttribute("events");
- if (s.compareTo("false") ==0) {
- setEventsVisible(false);
- } else {
- setEventsVisible(true);
- }
- s = elt.getAttribute("requests");
- if (s.compareTo("false") ==0) {
- setRequestsVisible(false);
- } else {
- setRequestsVisible(true);
- }
-
- } catch (Exception e) {
- // Model was saved in an older version of TTool
- //System.out.println("older format");
- setChannelsVisible(true);
- setEventsVisible(true);
- setRequestsVisible(true);
+ }*/
+
+
+ public boolean areAllVisible() {
+ return channelsVisible && eventsVisible && requestsVisible;
}
- }
-
- public void setConnectorsToFront() {
- TGComponent tgc;
-
- //System.out.println("list size=" + componentList.size());
-
- Iterator iterator = componentList.listIterator();
- ArrayList<TGComponent> list = new ArrayList<TGComponent>();
-
- while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
- if (!(tgc instanceof TGConnector)) {
- list.add(tgc);
- }
- }
-
-
- //System.out.println("Putting to back ...");
- for(TGComponent tgc1: list) {
- //System.out.println("Putting to back: " + tgc1);
- componentList.remove(tgc1);
- componentList.add(tgc1);
- }
- }
-
- public void delayedLoad() {
- Iterator iterator;
- TGComponent tgc;
-
- iterator = componentList.listIterator();
-
- while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
-
- if (tgc instanceof TMLCCompositeComponent) {
- ((TMLCCompositeComponent)(tgc)).delayedLoad();
- }
-
- if (tgc instanceof TMLCRemoteCompositeComponent) {
- try {
- ((TMLCRemoteCompositeComponent)(tgc)).delayedLoad();
- } catch (Exception e) {
- }
- }
- }
- }
-
- public void updatePorts() {
- TraceManager.addDev("Making paths");
- ArrayList<TMLCPath> paths = makePaths();
-
- // Checking rules of paths, and setting colors accordingly
- for(TMLCPath path: paths) {
- path.checkRules();
- if (path.hasError()) {
- TraceManager.addDev("Path error:" + path.getErrorMessage());
- }
- path.setColor();
- }
-
- }
-
- public void updatePorts_oldVersion() {
-
- TraceManager.addDev("Update ports / nb of components = " + componentList.size());
- Iterator iterator;
- TGComponent tgc;
-
- // Get all TMLCPrimitivePort
- ArrayList<TMLCCompositePort> ports = new ArrayList<TMLCCompositePort>();
- ArrayList<TMLCCompositePort> referencedports = new ArrayList<TMLCCompositePort>();
- ArrayList<TMLCPrimitivePort> pports = new ArrayList<TMLCPrimitivePort>();
- ArrayList<TMLCChannelFacility> facilities = new ArrayList<TMLCChannelFacility>();
-
- iterator = componentList.listIterator();
-
- while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
-
- if (tgc instanceof TMLCCompositeComponent) {
- ports.addAll(((TMLCCompositeComponent)tgc).getAllInternalCompositePorts());
- pports.addAll(((TMLCCompositeComponent)tgc).getAllInternalPrimitivePorts());
- referencedports.addAll(((TMLCCompositeComponent)tgc).getAllReferencedCompositePorts());
- }
-
- /*if (tgc instanceof TMLCRemoteCompositeComponent) {
- ports.addAll(((TMLCRemoteCompositeComponent)tgc).getAllInternalCompositePorts());
- pports.addAll(((TMLCRemoteCompositeComponent)tgc).getAllInternalPrimitivePorts());
- }*/
-
- if (tgc instanceof TMLCPrimitiveComponent) {
- pports.addAll(((TMLCPrimitiveComponent)tgc).getAllInternalPrimitivePorts());
- }
-
- if (tgc instanceof TMLCCompositePort) {
- ports.add((TMLCCompositePort)tgc);
- }
-
- if (tgc instanceof TMLCPrimitivePort) {
- pports.add((TMLCPrimitivePort)tgc);
- }
-
- if (tgc instanceof TMLCChannelFacility) {
- facilities.add((TMLCChannelFacility)tgc);
- }
- }
-
- // Remove All Current Links To Ports
- for(TMLCCompositePort port:ports) {
- if (!referencedports.contains(port)) {
- port.purge();
- }
- }
-
- // We take each primitive ports individually and we go thru the graph
- ArrayList<TMLCChannelFacility> mets = new ArrayList<TMLCChannelFacility>();
- TGConnector connector;
- TGConnectingPoint tp;
- String conflictMessage;
-
- //System.out.println("pports size=" + pports.size() + " ports size=" + ports.size());
-
- for(TMLCPrimitivePort pport:pports) {
- //System.out.println("port id=" + pport.getId());
- for(int i=0; i<pport.getNbConnectingPoint(); i++) {
- tp = pport.getTGConnectingPointAtIndex(i);
- connector = findTGConnectorUsing(tp);
- if (connector != null) {
- //System.out.println("Connector");
- mets.clear();
- conflictMessage = propagate(pport, tp, connector, mets);
- TraceManager.addDev("Conflict=" + conflictMessage);
- analysePorts(pport, mets, (conflictMessage != null), conflictMessage);
- } else {
- //System.out.println("no connector");
- }
- }
- }
- }
-
- public String propagate(TMLCPrimitivePort pport, TGConnectingPoint tp, TGConnector connector, ArrayList<TMLCChannelFacility> mets) {
- TGConnectingPoint tp2;
- TMLCChannelFacility cp = null;
- //boolean conflict = false;
- String conflictMessage = null;
- String conflictMessageTmp;
- boolean ret;
- int outindex, inindex;
-
- if (tp == connector.getTGConnectingPointP1()) {
- tp2 = connector.getTGConnectingPointP2();
- } else {
- tp2 = connector.getTGConnectingPointP1();
- }
-
- TGComponent tgc = (TGComponent)(tp2.getFather());
- int index = tgc.getIndexOfTGConnectingPoint(tp2);
-
- if (tgc instanceof TMLCPrimitivePort) {
- return conflictMessage;
- }
-
- // Cycle?
- //System.out.println("cycle?");
- if (mets.contains(tgc)) {
- //System.out.println("Conflict issue -1");
- return "Connection contains a cycle";
- }
-
- //System.out.println("Composite port? tgc=" + tgc);
- if(tgc instanceof TMLCCompositePort) {
- //System.out.println("Composite port!");
- cp = (TMLCChannelFacility)tgc;
- mets.add(cp);
-
- inindex = cp.getInpIndex();
- outindex = cp.getOutpIndex();
- // Already positionned port?
- if (pport.isOrigin()) {
- //System.out.println("Origin port");
- if (cp.getOutPort() != null) {
- //System.out.println("Two ports: pport.getType() = " + pport.getType());
- if (pport.getPortType() != 2) {
- //conflict = true;
- conflictMessage = "Conflicting ports types";
- //System.out.println("Conflict issue 0");
- } else {
- if (cp.getOutPort().getPortType() != 2) {
- conflictMessage = "More than two sending non-request ports ";
- //System.out.println("Conflict issue 1");
- } else {
- if ((outindex<5 && index>4) || (outindex>4 && index<5)) {
- conflictMessage = "Sending ports on both side of a composite port";
- //System.out.println("Conflict issue 2");
- }
- }
- }
- } else {
- if (inindex > -1) {
- if ((inindex<5 && index<5) || (inindex>4 && index>4)) {
- conflictMessage = "Sending and receiving ports on the same side of a composite port";
- //System.out.println("Conflict issue 3");
- }
- }
- //System.out.println("Setting out port");
- cp.setOutPort(pport);
- cp.setOutpIndex(index);
- }
- //System.out.println("Explore next");
- conflictMessageTmp = explore(pport, tp2, cp, mets);
- //System.out.println("Explore done");
- if (conflictMessageTmp != null) {
- conflictMessage = conflictMessageTmp;
- }
- } else {
- if (cp.getInPort() != null) {
- conflictMessage = "More than two receiving ports ";
- //System.out.println("Conflict issue 4");
- } else {
- if (outindex > -1) {
- if ((index<5 && outindex<5) || (index>4 && outindex>4)) {
- conflictMessage = "Sending and receiving ports on the same side of a composite port";
- //System.out.println("Conflict issue 5");
- }
- }
- cp.setInPort(pport);
- cp.setInpIndex(index);
- }
- conflictMessageTmp = explore(pport, tp2, cp, mets);
- if (conflictMessageTmp != null) {
- conflictMessage = conflictMessageTmp;
- }
- }
- } else if(tgc instanceof TMLCFork) {
- // Only one out, more than one in is ok
- // No TMLCJoin
- cp = (TMLCChannelFacility)tgc;
- mets.add(cp);
-
- // Checks that "mets" contains no TMLJoin
- for(TMLCChannelFacility met: mets) {
- if (met instanceof TMLCJoin) {
- conflictMessage = "Join and Fork operators are mixed in the same channel";
- conflictMessageTmp = explore(pport, tp2, cp, mets);
- if (conflictMessageTmp != null) {
- conflictMessage = conflictMessageTmp;
- }
- return conflictMessage;
- }
- }
-
- if (pport.isOrigin()) {
-
- //System.out.println("Origin port");
- if ((cp.getInPort() != null) && (cp.getInPort() != pport)) {
- conflictMessage = "More than two sending ports in a fork architecture";
- }
-
- cp.setInPort(pport);
-
- //System.out.println("Explore next");
- conflictMessageTmp = explore(pport, tp2, cp, mets);
- //System.out.println("Explore done");
- if (conflictMessageTmp != null) {
- conflictMessage = conflictMessageTmp;
- }
- } else {
- conflictMessage = explore(pport, tp2, cp, mets);
- }
- } else if(tgc instanceof TMLCJoin) {
- // Only one out, more than one in is ok
- // No TMLCFork
- cp = (TMLCChannelFacility)tgc;
- mets.add(cp);
-
- // Checks that "mets" contains no TMLJoin
- for(TMLCChannelFacility met: mets) {
- if (met instanceof TMLCFork) {
- conflictMessage = "Fork and Join operators are mixed in the same channel";
- conflictMessageTmp = explore(pport, tp2, cp, mets);
- if (conflictMessageTmp != null) {
- conflictMessage = conflictMessageTmp;
- }
- return conflictMessage;
- }
- }
-
- if (!pport.isOrigin()) {
-
- //System.out.println("Origin port");
- if ((cp.getOutPort() != null) && (cp.getOutPort() != pport)) {
- conflictMessage = "More than two receiving ports in a join architecture";
- }
- cp.setOutPort(pport);
-
-
- //System.out.println("Explore next");
- conflictMessageTmp = explore(pport, tp2, cp, mets);
- //System.out.println("Explore done");
- if (conflictMessageTmp != null) {
- conflictMessage = conflictMessageTmp;
- }
- } else {
- conflictMessage = explore(pport, tp2, cp, mets);
- }
- }
- if (cp != null) {
- if ((cp.getInPort() != null) && (cp.getOutPort() != null)){
- if (cp.getInPort().getType() != cp.getOutPort().getType()) {
- conflictMessage = "Ports are not compatible";
- } else {
- TraceManager.addDev("ports of " + cp + " are compatible out=" + cp.getOutPort().getType() + " in=" + cp.getInPort().getType());
- }
- }
- }
-
- return conflictMessage;
- }
-
- public String explore(TMLCPrimitivePort pport, TGConnectingPoint _tp, TMLCChannelFacility cp, ArrayList<TMLCChannelFacility> mets) {
- String conflictMessage = null;
- String conflictMessageTmp;
- TGConnectingPoint tp;
- TGConnector connector;
-
- for(int i=0; i<cp.getNbConnectingPoint(); i++) {
- tp = cp.getTGConnectingPointAtIndex(i);
- if (tp != _tp) {
- connector = findTGConnectorUsing(tp);
- if (connector != null) {
- conflictMessageTmp = propagate(pport, tp, connector, mets);
- if (conflictMessageTmp != null) {
- conflictMessage = conflictMessageTmp;
- }
- }
- }
- }
-
- return conflictMessage;
- }
-
- public void analysePorts(TMLCPrimitivePort pport, ArrayList<TMLCChannelFacility> mets, boolean conflict, String message) {
- if (mets.size() == 0) {
- return;
- }
-
- for(TMLCChannelFacility port: mets) {
- port.setConflict(conflict, message);
- }
- }
-
- /*public ArrayList<String> getAllTMLTaskNames(String _topname) {
+ public boolean areChannelsVisible() {
+ return channelsVisible;
+ }
+
+ public boolean areEventsVisible() {
+ return eventsVisible;
+ }
+
+ public boolean areRequestsVisible() {
+ return requestsVisible;
+ }
+
+ public void setChannelsVisible(boolean b) {
+ channelsVisible = b;
+ }
+
+ public void setEventsVisible(boolean b) {
+ eventsVisible = b;
+ }
+
+ public void setRequestsVisible(boolean b) {
+ requestsVisible = b;
+ }
+
+ public void loadExtraParameters(Element elt) {
+ String s;
+ //System.out.println("Extra parameter");
+ try {
+ s = elt.getAttribute("channels");
+ //System.out.println("S=" + s);
+ if (s.compareTo("false") ==0) {
+ setChannelsVisible(false);
+ } else {
+ setChannelsVisible(true);
+ }
+ s = elt.getAttribute("events");
+ if (s.compareTo("false") ==0) {
+ setEventsVisible(false);
+ } else {
+ setEventsVisible(true);
+ }
+ s = elt.getAttribute("requests");
+ if (s.compareTo("false") ==0) {
+ setRequestsVisible(false);
+ } else {
+ setRequestsVisible(true);
+ }
+
+ } catch (Exception e) {
+ // Model was saved in an older version of TTool
+ //System.out.println("older format");
+ setChannelsVisible(true);
+ setEventsVisible(true);
+ setRequestsVisible(true);
+ }
+ }
+
+ public void setConnectorsToFront() {
+ TGComponent tgc;
+
+ //System.out.println("list size=" + componentList.size());
+
+ Iterator iterator = componentList.listIterator();
+
+ ArrayList<TGComponent> list = new ArrayList<TGComponent>();
+
+ while(iterator.hasNext()) {
+ tgc = (TGComponent)(iterator.next());
+ if (!(tgc instanceof TGConnector)) {
+ list.add(tgc);
+ }
+ }
+
+
+ //System.out.println("Putting to back ...");
+ for(TGComponent tgc1: list) {
+ //System.out.println("Putting to back: " + tgc1);
+ componentList.remove(tgc1);
+ componentList.add(tgc1);
+ }
+ }
+
+ public void delayedLoad() {
+ Iterator iterator;
+ TGComponent tgc;
+
+ iterator = componentList.listIterator();
+
+ while(iterator.hasNext()) {
+ tgc = (TGComponent)(iterator.next());
+
+ if (tgc instanceof TMLCCompositeComponent) {
+ ((TMLCCompositeComponent)(tgc)).delayedLoad();
+ }
+
+ if (tgc instanceof TMLCRemoteCompositeComponent) {
+ try {
+ ((TMLCRemoteCompositeComponent)(tgc)).delayedLoad();
+ } catch (Exception e) {
+ }
+ }
+ }
+ }
+
+ public void updatePorts() {
+ TraceManager.addDev("Making paths");
+ ArrayList<TMLCPath> paths = makePaths();
+
+ // Checking rules of paths, and setting colors accordingly
+ for(TMLCPath path: paths) {
+ path.checkRules();
+ if (path.hasError()) {
+ TraceManager.addDev("Path error:" + path.getErrorMessage());
+ }
+ path.setColor();
+ }
+
+ }
+
+ public void updatePorts_oldVersion() {
+
+ TraceManager.addDev("Update ports / nb of components = " + componentList.size());
+ Iterator iterator;
+ TGComponent tgc;
+
+ // Get all TMLCPrimitivePort
+ ArrayList<TMLCCompositePort> ports = new ArrayList<TMLCCompositePort>();
+ ArrayList<TMLCCompositePort> referencedports = new ArrayList<TMLCCompositePort>();
+ ArrayList<TMLCPrimitivePort> pports = new ArrayList<TMLCPrimitivePort>();
+ ArrayList<TMLCChannelFacility> facilities = new ArrayList<TMLCChannelFacility>();
+
+ iterator = componentList.listIterator();
+
+ while(iterator.hasNext()) {
+ tgc = (TGComponent)(iterator.next());
+
+ if (tgc instanceof TMLCCompositeComponent) {
+ ports.addAll(((TMLCCompositeComponent)tgc).getAllInternalCompositePorts());
+ pports.addAll(((TMLCCompositeComponent)tgc).getAllInternalPrimitivePorts());
+ referencedports.addAll(((TMLCCompositeComponent)tgc).getAllReferencedCompositePorts());
+ }
+
+ /*if (tgc instanceof TMLCRemoteCompositeComponent) {
+ ports.addAll(((TMLCRemoteCompositeComponent)tgc).getAllInternalCompositePorts());
+ pports.addAll(((TMLCRemoteCompositeComponent)tgc).getAllInternalPrimitivePorts());
+ }*/
+
+ if (tgc instanceof TMLCPrimitiveComponent) {
+ pports.addAll(((TMLCPrimitiveComponent)tgc).getAllInternalPrimitivePorts());
+ }
+
+ if (tgc instanceof TMLCCompositePort) {
+ ports.add((TMLCCompositePort)tgc);
+ }
+
+ if (tgc instanceof TMLCPrimitivePort) {
+ pports.add((TMLCPrimitivePort)tgc);
+ }
+
+ if (tgc instanceof TMLCChannelFacility) {
+ facilities.add((TMLCChannelFacility)tgc);
+ }
+ }
+
+ // Remove All Current Links To Ports
+ for(TMLCCompositePort port:ports) {
+ if (!referencedports.contains(port)) {
+ port.purge();
+ }
+ }
+
+ // We take each primitive ports individually and we go thru the graph
+ ArrayList<TMLCChannelFacility> mets = new ArrayList<TMLCChannelFacility>();
+ TGConnector connector;
+ TGConnectingPoint tp;
+ String conflictMessage;
+
+ //System.out.println("pports size=" + pports.size() + " ports size=" + ports.size());
+
+ for(TMLCPrimitivePort pport:pports) {
+ //System.out.println("port id=" + pport.getId());
+ for(int i=0; i<pport.getNbConnectingPoint(); i++) {
+ tp = pport.getTGConnectingPointAtIndex(i);
+ connector = findTGConnectorUsing(tp);
+ if (connector != null) {
+ //System.out.println("Connector");
+ mets.clear();
+ conflictMessage = propagate(pport, tp, connector, mets);
+ TraceManager.addDev("Conflict=" + conflictMessage);
+ analysePorts(pport, mets, (conflictMessage != null), conflictMessage);
+ } else {
+ //System.out.println("no connector");
+ }
+ }
+ }
+ }
+
+ public String propagate(TMLCPrimitivePort pport, TGConnectingPoint tp, TGConnector connector, ArrayList<TMLCChannelFacility> mets) {
+ TGConnectingPoint tp2;
+ TMLCChannelFacility cp = null;
+ //boolean conflict = false;
+ String conflictMessage = null;
+ String conflictMessageTmp;
+ boolean ret;
+ int outindex, inindex;
+
+ if (tp == connector.getTGConnectingPointP1()) {
+ tp2 = connector.getTGConnectingPointP2();
+ } else {
+ tp2 = connector.getTGConnectingPointP1();
+ }
+
+ TGComponent tgc = (TGComponent)(tp2.getFather());
+ int index = tgc.getIndexOfTGConnectingPoint(tp2);
+
+ if (tgc instanceof TMLCPrimitivePort) {
+ return conflictMessage;
+ }
+
+ // Cycle?
+ //System.out.println("cycle?");
+ if (mets.contains(tgc)) {
+ //System.out.println("Conflict issue -1");
+ return "Connection contains a cycle";
+ }
+
+ //System.out.println("Composite port? tgc=" + tgc);
+ if(tgc instanceof TMLCCompositePort) {
+ //System.out.println("Composite port!");
+ cp = (TMLCChannelFacility)tgc;
+ mets.add(cp);
+
+ inindex = cp.getInpIndex();
+ outindex = cp.getOutpIndex();
+ // Already positionned port?
+ if (pport.isOrigin()) {
+ //System.out.println("Origin port");
+ if (cp.getOutPort() != null) {
+ //System.out.println("Two ports: pport.getType() = " + pport.getType());
+ if (pport.getPortType() != 2) {
+ //conflict = true;
+ conflictMessage = "Conflicting ports types";
+ //System.out.println("Conflict issue 0");
+ } else {
+ if (cp.getOutPort().getPortType() != 2) {
+ conflictMessage = "More than two sending non-request ports ";
+ //System.out.println("Conflict issue 1");
+ } else {
+ if ((outindex<5 && index>4) || (outindex>4 && index<5)) {
+ conflictMessage = "Sending ports on both side of a composite port";
+ //System.out.println("Conflict issue 2");
+ }
+ }
+ }
+ } else {
+ if (inindex > -1) {
+ if ((inindex<5 && index<5) || (inindex>4 && index>4)) {
+ conflictMessage = "Sending and receiving ports on the same side of a composite port";
+ //System.out.println("Conflict issue 3");
+ }
+ }
+ //System.out.println("Setting out port");
+ cp.setOutPort(pport);
+ cp.setOutpIndex(index);
+ }
+ //System.out.println("Explore next");
+ conflictMessageTmp = explore(pport, tp2, cp, mets);
+ //System.out.println("Explore done");
+ if (conflictMessageTmp != null) {
+ conflictMessage = conflictMessageTmp;
+ }
+ } else {
+ if (cp.getInPort() != null) {
+ conflictMessage = "More than two receiving ports ";
+ //System.out.println("Conflict issue 4");
+ } else {
+ if (outindex > -1) {
+ if ((index<5 && outindex<5) || (index>4 && outindex>4)) {
+ conflictMessage = "Sending and receiving ports on the same side of a composite port";
+ //System.out.println("Conflict issue 5");
+ }
+ }
+ cp.setInPort(pport);
+ cp.setInpIndex(index);
+ }
+ conflictMessageTmp = explore(pport, tp2, cp, mets);
+ if (conflictMessageTmp != null) {
+ conflictMessage = conflictMessageTmp;
+ }
+ }
+ } else if(tgc instanceof TMLCFork) {
+ // Only one out, more than one in is ok
+ // No TMLCJoin
+ cp = (TMLCChannelFacility)tgc;
+ mets.add(cp);
+
+ // Checks that "mets" contains no TMLJoin
+ for(TMLCChannelFacility met: mets) {
+ if (met instanceof TMLCJoin) {
+ conflictMessage = "Join and Fork operators are mixed in the same channel";
+ conflictMessageTmp = explore(pport, tp2, cp, mets);
+ if (conflictMessageTmp != null) {
+ conflictMessage = conflictMessageTmp;
+ }
+ return conflictMessage;
+ }
+ }
+
+ if (pport.isOrigin()) {
+
+ //System.out.println("Origin port");
+ if ((cp.getInPort() != null) && (cp.getInPort() != pport)) {
+ conflictMessage = "More than two sending ports in a fork architecture";
+ }
+
+ cp.setInPort(pport);
+
+ //System.out.println("Explore next");
+ conflictMessageTmp = explore(pport, tp2, cp, mets);
+ //System.out.println("Explore done");
+ if (conflictMessageTmp != null) {
+ conflictMessage = conflictMessageTmp;
+ }
+ } else {
+ conflictMessage = explore(pport, tp2, cp, mets);
+ }
+ } else if(tgc instanceof TMLCJoin) {
+ // Only one out, more than one in is ok
+ // No TMLCFork
+ cp = (TMLCChannelFacility)tgc;
+ mets.add(cp);
+
+ // Checks that "mets" contains no TMLJoin
+ for(TMLCChannelFacility met: mets) {
+ if (met instanceof TMLCFork) {
+ conflictMessage = "Fork and Join operators are mixed in the same channel";
+ conflictMessageTmp = explore(pport, tp2, cp, mets);
+ if (conflictMessageTmp != null) {
+ conflictMessage = conflictMessageTmp;
+ }
+ return conflictMessage;
+ }
+ }
+
+ if (!pport.isOrigin()) {
+
+ //System.out.println("Origin port");
+ if ((cp.getOutPort() != null) && (cp.getOutPort() != pport)) {
+ conflictMessage = "More than two receiving ports in a join architecture";
+ }
+ cp.setOutPort(pport);
+
+
+ //System.out.println("Explore next");
+ conflictMessageTmp = explore(pport, tp2, cp, mets);
+ //System.out.println("Explore done");
+ if (conflictMessageTmp != null) {
+ conflictMessage = conflictMessageTmp;
+ }
+ } else {
+ conflictMessage = explore(pport, tp2, cp, mets);
+ }
+ }
+ if (cp != null) {
+ if ((cp.getInPort() != null) && (cp.getOutPort() != null)){
+ if (cp.getInPort().getType() != cp.getOutPort().getType()) {
+ conflictMessage = "Ports are not compatible";
+ } else {
+ TraceManager.addDev("ports of " + cp + " are compatible out=" + cp.getOutPort().getType() + " in=" + cp.getInPort().getType());
+ }
+ }
+ }
+
+ return conflictMessage;
+ }
+
+ public String explore(TMLCPrimitivePort pport, TGConnectingPoint _tp, TMLCChannelFacility cp, ArrayList<TMLCChannelFacility> mets) {
+ String conflictMessage = null;
+ String conflictMessageTmp;
+ TGConnectingPoint tp;
+ TGConnector connector;
+
+ for(int i=0; i<cp.getNbConnectingPoint(); i++) {
+ tp = cp.getTGConnectingPointAtIndex(i);
+ if (tp != _tp) {
+ connector = findTGConnectorUsing(tp);
+ if (connector != null) {
+ conflictMessageTmp = propagate(pport, tp, connector, mets);
+ if (conflictMessageTmp != null) {
+ conflictMessage = conflictMessageTmp;
+ }
+ }
+ }
+ }
+
+ return conflictMessage;
+ }
+
+ public void analysePorts(TMLCPrimitivePort pport, ArrayList<TMLCChannelFacility> mets, boolean conflict, String message) {
+ if (mets.size() == 0) {
+ return;
+ }
+
+ for(TMLCChannelFacility port: mets) {
+ port.setConflict(conflict, message);
+ }
+ }
+
+ /*public ArrayList<String> getAllTMLTaskNames(String _topname) {
TGComponent tgc;
Iterator iterator = componentList.listIterator();
ArrayList<String> list = new ArrayList<String>();
while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
- if (tgc instanceof TMLTaskOperator) {
- list.add(_topname + "::" + ((TMLTaskOperator)tgc).getTaskName());
- }
+ tgc = (TGComponent)(iterator.next());
+ if (tgc instanceof TMLTaskOperator) {
+ list.add(_topname + "::" + ((TMLTaskOperator)tgc).getTaskName());
+ }
}
return list;
- }*/
-
- /*public ArrayList<String> getAllTMLCommunicationNames(String _topname) {
+ }*/
+
+ /*public ArrayList<String> getAllTMLCommunicationNames(String _topname) {
TGComponent tgc;
Iterator iterator = componentList.listIterator();
ArrayList<String> list = new ArrayList<String>();
@@ -1178,343 +1180,343 @@ public class TMLComponentTaskDiagramPanel extends TDiagramPanel implements TDPWi
String type = "";
while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
- if (tgc instanceof TMLCompositionOperator) {
- if (tgc instanceof TMLEventOperator) {
- name = ((TMLEventOperator)tgc).getEventName();
- type = "Event";
- }
- if (tgc instanceof TMLChannelOperator) {
- name = ((TMLChannelOperator)tgc).getChannelName();
- type = "Channel";
- }
- if (tgc instanceof TMLRequestOperator) {
- name = ((TMLRequestOperator)tgc).getRequestName();
- type = "Request";
- }
-
- list.add(_topname + "::" + name + " (" + type + ")");
- }
+ tgc = (TGComponent)(iterator.next());
+ if (tgc instanceof TMLCompositionOperator) {
+ if (tgc instanceof TMLEventOperator) {
+ name = ((TMLEventOperator)tgc).getEventName();
+ type = "Event";
+ }
+ if (tgc instanceof TMLChannelOperator) {
+ name = ((TMLChannelOperator)tgc).getChannelName();
+ type = "Channel";
+ }
+ if (tgc instanceof TMLRequestOperator) {
+ name = ((TMLRequestOperator)tgc).getRequestName();
+ type = "Request";
+ }
+
+ list.add(_topname + "::" + name + " (" + type + ")");
+ }
}
return list;
- }*/
-
- /*public ArrayList<String> getAllNonMappedTMLTaskNames(String _topName, TMLArchiDiagramPanel _tadp, boolean ref, String _name) {
+ }*/
+
+ /*public ArrayList<String> getAllNonMappedTMLTaskNames(String _topName, TMLArchiDiagramPanel _tadp, boolean ref, String _name) {
TGComponent tgc;
Iterator iterator = componentList.listIterator();
ArrayList<String> list = new ArrayList<String>();
String name;
while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
- if (tgc instanceof TMLTaskOperator) {
- name = ((TMLTaskOperator)tgc).getTaskName();
- if (ref && name.equals(_name)) {
- list.add(_topName + "::" + name);
- } else {
- if (!_tadp.isMapped(_topName, name)) {
- list.add(_topName + "::" + name);
- }
- }
- }
+ tgc = (TGComponent)(iterator.next());
+ if (tgc instanceof TMLTaskOperator) {
+ name = ((TMLTaskOperator)tgc).getTaskName();
+ if (ref && name.equals(_name)) {
+ list.add(_topName + "::" + name);
+ } else {
+ if (!_tadp.isMapped(_topName, name)) {
+ list.add(_topName + "::" + name);
+ }
+ }
+ }
}
return list;
- }*/
-
- /*public TMLTaskOperator getTaskByName(String _name) {
+ }*/
+
+ /*public TMLTaskOperator getTaskByName(String _name) {
TGComponent tgc;
Iterator iterator = componentList.listIterator();
ArrayList<String> list = new ArrayList<String>();
while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
- if (tgc instanceof TMLTaskOperator) {
- if (((TMLTaskOperator)tgc).getTaskName().equals(_name)) {
- return ((TMLTaskOperator)tgc);
- }
- }
+ tgc = (TGComponent)(iterator.next());
+ if (tgc instanceof TMLTaskOperator) {
+ if (((TMLTaskOperator)tgc).getTaskName().equals(_name)) {
+ return ((TMLTaskOperator)tgc);
+ }
+ }
}
return null;
- }*/
-
- public Vector<String> getAllRecords(TMLCPrimitiveComponent tgc) {
- Vector<String> list = new Vector<String>();
- getAllRecords((TMLCCompositeComponent)(tgc.getFather()), list);
- return list;
- }
-
- public void getAllRecords(TMLCCompositeComponent comp, Vector<String> list) {
- TGComponent tgc;
- if (comp == null) {
- Iterator iterator = componentList.listIterator();
-
- while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
- if (tgc instanceof TMLCRecordComponent) {
- list.add(tgc.getValue());
- }
- }
- return;
- }
+ }*/
- for(int i=0; i<comp.getNbInternalTGComponent(); i++) {
- tgc = comp.getInternalTGComponent(i);
- if (tgc instanceof TMLCRecordComponent) {
- list.add(tgc.getValue());
- }
+ public Vector<String> getAllRecords(TMLCPrimitiveComponent tgc) {
+ Vector<String> list = new Vector<String>();
+ getAllRecords((TMLCCompositeComponent)(tgc.getFather()), list);
+ return list;
}
- getAllRecords((TMLCCompositeComponent)(comp.getFather()), list);
- }
-
- public TMLCRecordComponent getRecordNamed(TMLCPrimitiveComponent tgc, String _nameOfRecord) {
- return getRecordNamed((TMLCCompositeComponent)(tgc.getFather()), _nameOfRecord);
- }
-
- public TMLCRecordComponent getRecordNamed(TMLCCompositeComponent comp, String _nameOfRecord) {
- TGComponent tgc;
- if (comp == null) {
- Iterator iterator = componentList.listIterator();
-
- while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
- if (tgc instanceof TMLCRecordComponent) {
- if (tgc.getValue().compareTo(_nameOfRecord) == 0) {
- return (TMLCRecordComponent)tgc;
- }
+ public void getAllRecords(TMLCCompositeComponent comp, Vector<String> list) {
+ TGComponent tgc;
+ if (comp == null) {
+ Iterator iterator = componentList.listIterator();
+
+ while(iterator.hasNext()) {
+ tgc = (TGComponent)(iterator.next());
+ if (tgc instanceof TMLCRecordComponent) {
+ list.add(tgc.getValue());
+ }
+ }
+ return;
}
- }
- return null;
- }
-
- for(int i=0; i<comp.getNbInternalTGComponent(); i++) {
- tgc = comp.getInternalTGComponent(i);
- if (tgc instanceof TMLCRecordComponent) {
- if (tgc.getValue().compareTo(_nameOfRecord) == 0) {
- return (TMLCRecordComponent)tgc;
+
+ for(int i=0; i<comp.getNbInternalTGComponent(); i++) {
+ tgc = comp.getInternalTGComponent(i);
+ if (tgc instanceof TMLCRecordComponent) {
+ list.add(tgc.getValue());
+ }
}
- }
+
+ getAllRecords((TMLCCompositeComponent)(comp.getFather()), list);
}
- return getRecordNamed((TMLCCompositeComponent)(comp.getFather()), _nameOfRecord);
- }
-
-
- public void findAllReferencedPanels(ArrayList<TMLComponentTaskDiagramPanel> panels) {
- if (panels.contains(this)) {
- return;
+ public TMLCRecordComponent getRecordNamed(TMLCPrimitiveComponent tgc, String _nameOfRecord) {
+ return getRecordNamed((TMLCCompositeComponent)(tgc.getFather()), _nameOfRecord);
}
-
- panels.add(this);
-
- ListIterator iterator = componentList.listIterator();
- TGComponent tgc;
-
- while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
-
- if (tgc instanceof TMLCRemoteCompositeComponent) {
- TMLCRemoteCompositeComponent remote = (TMLCRemoteCompositeComponent)tgc;
- TDiagramPanel panel = remote.getReferencedDiagram();
- if ((panel != null) && (panel instanceof TMLComponentTaskDiagramPanel)){
- ((TMLComponentTaskDiagramPanel)panel).findAllReferencedPanels(panels);
+ public TMLCRecordComponent getRecordNamed(TMLCCompositeComponent comp, String _nameOfRecord) {
+ TGComponent tgc;
+ if (comp == null) {
+ Iterator iterator = componentList.listIterator();
+
+ while(iterator.hasNext()) {
+ tgc = (TGComponent)(iterator.next());
+ if (tgc instanceof TMLCRecordComponent) {
+ if (tgc.getValue().compareTo(_nameOfRecord) == 0) {
+ return (TMLCRecordComponent)tgc;
+ }
+ }
+ }
+ return null;
}
- }
-
- if (tgc instanceof TMLCCompositeComponent) {
- //We must find all panels referencing this component
- panels.addAll(mgui.getAllPanelsReferencingTMLCCompositeComponent((TMLCCompositeComponent)tgc));
- }
+
+ for(int i=0; i<comp.getNbInternalTGComponent(); i++) {
+ tgc = comp.getInternalTGComponent(i);
+ if (tgc instanceof TMLCRecordComponent) {
+ if (tgc.getValue().compareTo(_nameOfRecord) == 0) {
+ return (TMLCRecordComponent)tgc;
+ }
+ }
+ }
+
+ return getRecordNamed((TMLCCompositeComponent)(comp.getFather()), _nameOfRecord);
}
- }
-
- public ArrayList<TMLCPath> makePaths() {
- ArrayList<TMLComponentTaskDiagramPanel> panels = new ArrayList<TMLComponentTaskDiagramPanel>();
-
- // We first find all the implicated panels
- findAllReferencedPanels(panels);
- TraceManager.addDev("Nb of handled panels:" + panels.size());
- ArrayList<TMLCPath> paths = new ArrayList<TMLCPath>();
- ListIterator iterator;
- TGComponent tgc;
-
- // Go through the compnent list of all panels, and make paths. Then, go thru connectors, and merge paths until no
- // more merging is possible
- for (TDiagramPanel panel: panels) {
- iterator = panel.getComponentList().listIterator();
-
-
- ArrayList<TMLCCompositePort> listcp;
- ArrayList<TMLCPrimitivePort> listpp;
-
-
- while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
-
- if (tgc instanceof TMLCCompositeComponent) {
- listcp = ((TMLCCompositeComponent)tgc).getAllInternalCompositePorts();
- for(TMLCCompositePort cp: listcp) {
- addToPaths(paths, cp);
- }
-
- listpp = ((TMLCCompositeComponent)tgc).getAllInternalPrimitivePorts();
- for(TMLCPrimitivePort pp: listpp) {
- addToPaths(paths, pp);
- }
+ public void findAllReferencedPanels(ArrayList<TMLComponentTaskDiagramPanel> panels) {
+ if (panels.contains(this)) {
+ return;
}
- if (tgc instanceof TMLCPrimitiveComponent) {
- listpp = ((TMLCPrimitiveComponent)tgc).getAllInternalPrimitivePorts();
- for(TMLCPrimitivePort pp: listpp) {
- addToPaths(paths, pp);
- }
- }
- if (tgc instanceof TMLCPrimitivePort) {
- addToPaths(paths, tgc);
- }
+ panels.add(this);
- if (tgc instanceof TMLCChannelFacility) {
- addToPaths(paths, tgc);
- }
+ ListIterator iterator = componentList.listIterator();
+ TGComponent tgc;
- /* We also include the paths of diagrams referenced via referenced components */
- if (tgc instanceof TMLCRemoteCompositeComponent) {
- TMLCRemoteCompositeComponent remote = (TMLCRemoteCompositeComponent)tgc;
-
- // Nothing to do: referenced ports are added thanks to the analyzes of the referenced panels
- // and the handling of that issue in connector analysis
+ while(iterator.hasNext()) {
+ tgc = (TGComponent)(iterator.next());
+
+ if (tgc instanceof TMLCRemoteCompositeComponent) {
+ TMLCRemoteCompositeComponent remote = (TMLCRemoteCompositeComponent)tgc;
+ TDiagramPanel panel = remote.getReferencedDiagram();
+ if ((panel != null) && (panel instanceof TMLComponentTaskDiagramPanel)){
+ ((TMLComponentTaskDiagramPanel)panel).findAllReferencedPanels(panels);
+ }
+ }
+
+ if (tgc instanceof TMLCCompositeComponent) {
+ //We must find all panels referencing this component
+ panels.addAll(mgui.getAllPanelsReferencingTMLCCompositeComponent((TMLCCompositeComponent)tgc));
+ }
}
- }
}
-
- // Use connectors to merge paths with one another
-
- for (TDiagramPanel panel: panels) {
- iterator = panel.getComponentList().listIterator();
- TMLCPortConnector connector;
- TGComponent tgc1, tgc2;
- TMLCPath path1, path2;
-
- while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
+ public ArrayList<TMLCPath> makePaths() {
+ ArrayList<TMLComponentTaskDiagramPanel> panels = new ArrayList<TMLComponentTaskDiagramPanel>();
- if (tgc instanceof TMLCPortConnector) {
- connector = (TMLCPortConnector)tgc;
- if (connector.getTGConnectingPointP1().getFather() instanceof TGComponent) {
- tgc1 = (TGComponent)(connector.getTGConnectingPointP1().getFather());
- } else {
- tgc1 = null;
- }
- if (connector.getTGConnectingPointP2().getFather() instanceof TGComponent) {
- tgc2 = (TGComponent)(connector.getTGConnectingPointP2().getFather());
- } else {
- tgc2 = null;
- }
-
-
- if (tgc1 instanceof TMLCRemoteCompositeComponent) {
- tgc1 = ((TMLCRemoteCompositeComponent)tgc1).getPortOf(connector.getTGConnectingPointP1());
- }
- if (tgc2 instanceof TMLCRemoteCompositeComponent) {
- tgc2 = ((TMLCRemoteCompositeComponent)tgc2).getPortOf(connector.getTGConnectingPointP2());
- }
-
- TraceManager.addDev("tgc1=" + tgc1 + " tgc2=" + tgc2);
-
-
- if ((tgc1 != null) && (tgc2 != null) && (tgc1 != tgc2)) {
+ // We first find all the implicated panels
+ findAllReferencedPanels(panels);
+ TraceManager.addDev("Nb of handled panels:" + panels.size());
+
+ ArrayList<TMLCPath> paths = new ArrayList<TMLCPath>();
+ ListIterator iterator;
+ TGComponent tgc;
+
+ // Go through the compnent list of all panels, and make paths. Then, go thru connectors, and merge paths until no
+ // more merging is possible
+
+ for (TDiagramPanel panel: panels) {
+ iterator = panel.getComponentList().listIterator();
- path1 = getPathOf(paths, tgc1);
- path2 = getPathOf(paths, tgc2);
- if ((path1 != null) && (path2 != null)) {
- // Not in the same path -> we must do a merging
- // and then we remove path2 from path
- if (path1 != path2) {
- path1.mergeWith(path2);
- paths.remove(path2);
- }
- }
- } else {
- // If there is a null component in the path, then, we must set an error in the path
- if ((tgc1 == null) && (tgc2 != null)) {
- path2 = getPathOf(paths, tgc2);
- path2.setErrorOfConnection(true);
-
+
+ ArrayList<TMLCCompositePort> listcp;
+ ArrayList<TMLCPrimitivePort> listpp;
+
+
+ while(iterator.hasNext()) {
+ tgc = (TGComponent)(iterator.next());
+
+ if (tgc instanceof TMLCCompositeComponent) {
+ listcp = ((TMLCCompositeComponent)tgc).getAllInternalCompositePorts();
+ for(TMLCCompositePort cp: listcp) {
+ addToPaths(paths, cp);
+ }
+
+ listpp = ((TMLCCompositeComponent)tgc).getAllInternalPrimitivePorts();
+ for(TMLCPrimitivePort pp: listpp) {
+ addToPaths(paths, pp);
+ }
+ }
+
+ if (tgc instanceof TMLCPrimitiveComponent) {
+ listpp = ((TMLCPrimitiveComponent)tgc).getAllInternalPrimitivePorts();
+ for(TMLCPrimitivePort pp: listpp) {
+ addToPaths(paths, pp);
+ }
+ }
+
+ if (tgc instanceof TMLCPrimitivePort) {
+ addToPaths(paths, tgc);
+ }
+
+ if (tgc instanceof TMLCChannelFacility) {
+ addToPaths(paths, tgc);
+ }
+
+ /* We also include the paths of diagrams referenced via referenced components */
+ if (tgc instanceof TMLCRemoteCompositeComponent) {
+ TMLCRemoteCompositeComponent remote = (TMLCRemoteCompositeComponent)tgc;
+
+ // Nothing to do: referenced ports are added thanks to the analyzes of the referenced panels
+ // and the handling of that issue in connector analysis
+ }
}
+ }
+
+
+ // Use connectors to merge paths with one another
+
+ for (TDiagramPanel panel: panels) {
+ iterator = panel.getComponentList().listIterator();
+ TMLCPortConnector connector;
+ TGComponent tgc1, tgc2;
+ TMLCPath path1, path2;
- if ((tgc2 == null) && (tgc1 != null)) {
- path1 = getPathOf(paths, tgc1);
- path1.setErrorOfConnection(true);
+ while(iterator.hasNext()) {
+ tgc = (TGComponent)(iterator.next());
+
+ if (tgc instanceof TMLCPortConnector) {
+ connector = (TMLCPortConnector)tgc;
+ if (connector.getTGConnectingPointP1().getFather() instanceof TGComponent) {
+ tgc1 = (TGComponent)(connector.getTGConnectingPointP1().getFather());
+ } else {
+ tgc1 = null;
+ }
+ if (connector.getTGConnectingPointP2().getFather() instanceof TGComponent) {
+ tgc2 = (TGComponent)(connector.getTGConnectingPointP2().getFather());
+ } else {
+ tgc2 = null;
+ }
+
+
+ if (tgc1 instanceof TMLCRemoteCompositeComponent) {
+ tgc1 = ((TMLCRemoteCompositeComponent)tgc1).getPortOf(connector.getTGConnectingPointP1());
+ }
+ if (tgc2 instanceof TMLCRemoteCompositeComponent) {
+ tgc2 = ((TMLCRemoteCompositeComponent)tgc2).getPortOf(connector.getTGConnectingPointP2());
+ }
+
+ TraceManager.addDev("tgc1=" + tgc1 + " tgc2=" + tgc2);
+
+
+ if ((tgc1 != null) && (tgc2 != null) && (tgc1 != tgc2)) {
+
+ path1 = getPathOf(paths, tgc1);
+ path2 = getPathOf(paths, tgc2);
+ if ((path1 != null) && (path2 != null)) {
+ // Not in the same path -> we must do a merging
+ // and then we remove path2 from path
+ if (path1 != path2) {
+ path1.mergeWith(path2);
+ paths.remove(path2);
+ }
+ }
+ } else {
+ // If there is a null component in the path, then, we must set an error in the path
+ if ((tgc1 == null) && (tgc2 != null)) {
+ path2 = getPathOf(paths, tgc2);
+ path2.setErrorOfConnection(true);
+
+ }
+
+ if ((tgc2 == null) && (tgc1 != null)) {
+ path1 = getPathOf(paths, tgc1);
+ path1.setErrorOfConnection(true);
+ }
+ }
+
+ }
}
- }
-
}
- }
+
+ TraceManager.addDev("----------- Nb of paths: " + paths.size());
+
+
+ return paths;
+
}
- TraceManager.addDev("----------- Nb of paths: " + paths.size());
-
-
- return paths;
-
- }
-
- public TMLCPath getPathOf(ArrayList<TMLCPath> paths, TGComponent tgc) {
- for(TMLCPath path: paths) {
- if (path.contains(tgc)) {
- return path;
- }
+ public TMLCPath getPathOf(ArrayList<TMLCPath> paths, TGComponent tgc) {
+ for(TMLCPath path: paths) {
+ if (path.contains(tgc)) {
+ return path;
+ }
+ }
+
+ return null;
}
- return null;
- }
-
- public void addToPaths(ArrayList<TMLCPath> paths, TGComponent tgc) {
- Boolean found = false;
-
- for(TMLCPath path: paths) {
- if (path.contains(tgc)) {
- found = true;
- return;
- }
+ public void addToPaths(ArrayList<TMLCPath> paths, TGComponent tgc) {
+ Boolean found = false;
+
+ for(TMLCPath path: paths) {
+ if (path.contains(tgc)) {
+ found = true;
+ return;
+ }
+ }
+
+ // Create a new path
+ TMLCPath ph = new TMLCPath();
+ ph.addComponent(tgc);
+ paths.add(ph);
+
}
- // Create a new path
- TMLCPath ph = new TMLCPath();
- ph.addComponent(tgc);
- paths.add(ph);
- }
-
-
- public void getPanelsUsingAComponent(TMLCCompositeComponent tmlcc, ArrayList<TMLComponentTaskDiagramPanel> panels) {
- //System.out.println("Update from " + tmlcc.getValue());
- Iterator iterator = componentList.listIterator();
- TGComponent tgc;
-
- while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
- if (tgc instanceof TMLCCompositeComponent) {
- if (((TMLCCompositeComponent)tgc).hasRefencesTo(tmlcc)) {
- panels.add(this);
- return;
- }
- }
-
- if (tgc instanceof TMLCRemoteCompositeComponent) {
- if (((TMLCRemoteCompositeComponent)tgc).getReference() == tmlcc) {
- panels.add(this);
- return;
+ public void getPanelsUsingAComponent(TMLCCompositeComponent tmlcc, ArrayList<TMLComponentTaskDiagramPanel> panels) {
+ //System.out.println("Update from " + tmlcc.getValue());
+ Iterator iterator = componentList.listIterator();
+ TGComponent tgc;
+
+ while(iterator.hasNext()) {
+ tgc = (TGComponent)(iterator.next());
+ if (tgc instanceof TMLCCompositeComponent) {
+ if (((TMLCCompositeComponent)tgc).hasRefencesTo(tmlcc)) {
+ panels.add(this);
+ return;
+ }
+ }
+
+ if (tgc instanceof TMLCRemoteCompositeComponent) {
+ if (((TMLCRemoteCompositeComponent)tgc).getReference() == tmlcc) {
+ panels.add(this);
+ return;
+ }
+ }
}
- }
- }
- }
+ }
}
diff --git a/src/ui/tmldd/TMLArchiCommunicationArtifact.java b/src/ui/tmldd/TMLArchiCommunicationArtifact.java
index 76d5ada8728d1981390fa72a31c680fa67f492e7..2275351d66b8acd60464f176ac7d516020d55a8c 100755
--- a/src/ui/tmldd/TMLArchiCommunicationArtifact.java
+++ b/src/ui/tmldd/TMLArchiCommunicationArtifact.java
@@ -161,8 +161,8 @@ public class TMLArchiCommunicationArtifact extends TGCWithoutInternalComponent i
String tmp;
boolean error = false;
- JDialogCommunicationArtifact dialog = new JDialogCommunicationArtifact(frame, "Setting artifact attributes", this);
- dialog.setSize(400, 350);
+ JDialogCommunicationArtifact dialog = new JDialogCommunicationArtifact(frame, "Setting channel artifact attributes", this);
+ dialog.setSize(700, 600);
GraphicLib.centerOnParent(dialog);
dialog.show(); // blocked until dialog has been closed
diff --git a/src/ui/window/JDialogCommunicationArtifact.java b/src/ui/window/JDialogCommunicationArtifact.java
index 4539ae2cd58a21f3bd9887c5371b8efc97f69e3b..f1d12ed2f87bb5cde16c4506f35381e23fa21842 100755
--- a/src/ui/window/JDialogCommunicationArtifact.java
+++ b/src/ui/window/JDialogCommunicationArtifact.java
@@ -116,7 +116,7 @@ public class JDialogCommunicationArtifact extends javax.swing.JDialog implements
panel2 = new JPanel();
panel2.setLayout(gridbag2);
panel2.setBorder(new javax.swing.border.TitledBorder("Artifact attributes"));
- panel2.setPreferredSize(new Dimension(350, 250));
+ panel2.setPreferredSize(new Dimension(650, 350));
c1.gridwidth = 1;
c1.gridheight = 1;