Changeset 1761 for trunk

Timestamp:

09/24/14 12:04:59 (10 years ago)

Author:

sherbold

Message:

• fixed another but related to the DSL compability of the generated sequence diagrams

File:

• trunk/autoquest-plugin-uml/src/main/java/de/ugoe/cs/autoquest/plugin/uml/UMLUtils.java (modified) (4 diffs)

trunk/autoquest-plugin-uml/src/main/java/de/ugoe/cs/autoquest/plugin/uml/UMLUtils.java

@@ -40 +40 @@
 import org.eclipse.uml2.uml.Port;
 import org.eclipse.uml2.uml.Profile;
+import org.eclipse.uml2.uml.Property;
 import org.eclipse.uml2.uml.Region;
 import org.eclipse.uml2.uml.StateMachine;
@@ -286 +287 @@
             (Interaction) testContext.createPackagedElement(interactionName + "_Impl",
                                                             UMLPackage.Literals.INTERACTION);
+        
+        operation.getMethods().add(interaction);
 
         Lifeline userLifeline = interaction.createLifeline("user");
@@ -293 +296 @@
         Component userComponent =
             (Component) model.getPackagedElement("User", true, UMLPackage.Literals.COMPONENT, true);
-        Port userPort = (Port) userComponent.getAttribute("p_user_rlus", null);
+        
+        EList<Property> userAttributes = userComponent.getAttributes();
+        List<Port> userPorts = new LinkedList<>();
+        for( Property userAttribute : userAttributes ) {
+            if( userAttribute instanceof Port ) {
+                userPorts.add((Port) userAttribute);
+            }
+        }
 
         int i = 0;
@@ -342 +352 @@
                 message.setSendEvent(sendFragment);
                 message.setReceiveEvent(recvFragment);
-
-                EList<ConnectorEnd> sourceEnds = userPort.getEnds();
+                
                 EList<ConnectorEnd> targetEnds = portMap.get(serviceName).getEnds();
 
-                for (ConnectorEnd sourceEnd : sourceEnds) {
-                    Connector sourceConnector = (Connector) sourceEnd.eContainer();
-                    for (ConnectorEnd targetEnd : targetEnds) {
-                        Connector targetConnector = (Connector) targetEnd.eContainer();
-                        if (targetConnector == sourceConnector) {
-                            message.setConnector(targetConnector);
+                for( Port userPort : userPorts ) {
+                    EList<ConnectorEnd> sourceEnds = userPort.getEnds();
+                    for (ConnectorEnd sourceEnd : sourceEnds) {
+                        Connector sourceConnector = (Connector) sourceEnd.eContainer();
+                        for (ConnectorEnd targetEnd : targetEnds) {
+                            Connector targetConnector = (Connector) targetEnd.eContainer();
+                            if (targetConnector == sourceConnector) {
+                                message.setConnector(targetConnector);
+                            }
                         }
                     }