Changeset 2001 for trunk/autoquest-plugin-uml

Timestamp:

07/10/15 10:23:29 (9 years ago)

Author:

sherbold

Message:

• updated connector inference; now we do not make the assumption anymore that there is only one connector between lifelines

File:

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

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

@@ -60 +60 @@
 import org.eclipse.uml2.uml.MessageSort;
 import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.NamedElement;
 import org.eclipse.uml2.uml.Operation;
 import org.eclipse.uml2.uml.Package;
@@ -77 +78 @@
 
 import de.ugoe.cs.autoquest.eventcore.Event;
-import de.ugoe.cs.autoquest.eventcore.EventUtils;
 import de.ugoe.cs.autoquest.plugin.http.SOAPUtils;
 import de.ugoe.cs.autoquest.plugin.http.eventcore.SOAPEventType;
@@ -536 +536 @@
                     getOperationFromName(targetInterface.getOperations(), methodName);
                 // get connector
-                Connector connector = inferConnector(msgSourceLifeline, msgTargetLifeline);
+                System.out.println(event.getType());
+                Connector connector = inferConnector(msgSourceLifeline, msgTargetLifeline, targetInterface);
+                if( connector==null ) {
+                    throw new RuntimeException("Error creating message: could not find connector between the two life lines that supports the target interface at the target lifeline");
+                }
 
                 boolean asynch = false;
@@ -979 +983 @@
      * Infers connector between two lifelines.
      * </p>
-     * <p>
-     * TODO: Currently assumes only one connector between two lifelines possible. This assumption is
-     * invalid as soon as there are two ports that connect the same two properties.
-     * </p>
      * 
      * @param msgSourceLifeline
@@ -989 +989 @@
      *            target lifeline of the message
      */
-    private static Connector inferConnector(Lifeline msgSourceLifeline, Lifeline msgTargetLifeline)
+    private static Connector inferConnector(Lifeline msgSourceLifeline, Lifeline msgTargetLifeline, Interface targetInterface)
     {
         EList<Property> userAttributes =
-            ((Component) msgSourceLifeline.getRepresents().getType()).getAttributes();
+            ((Component) msgSourceLifeline.getRepresents().getType()).getAllAttributes();
         EList<Property> targetAttributes =
-            ((Component) msgTargetLifeline.getRepresents().getType()).getAttributes();
+            ((Component) msgTargetLifeline.getRepresents().getType()).getAllAttributes();
         for (Property userAttribute : userAttributes) {
             if (userAttribute instanceof Port) {
@@ -1002 +1002 @@
                     for (Property targetAttribute : targetAttributes) {
                         if (targetAttribute instanceof Port) {
-                            EList<ConnectorEnd> targetEnds = ((Port) targetAttribute).getEnds();
-                            for (ConnectorEnd targetEnd : targetEnds) {
-                                Connector targetConnector = (Connector) targetEnd.eContainer();
-                                if (targetConnector == userConnector) {
-                                    return targetConnector;
+                            if( ((Port) targetAttribute).getProvideds().contains(targetInterface) ) {
+                                EList<ConnectorEnd> targetEnds = ((Port) targetAttribute).getEnds();
+                                for (ConnectorEnd targetEnd : targetEnds) {
+                                    Connector targetConnector = (Connector) targetEnd.eContainer();
+                                    if (targetConnector == userConnector) {
+                                        return targetConnector;
+                                    }
                                 }
                             }