Changeset 1633

Timestamp:

07/31/14 14:37:39 (10 years ago)

Author:

sherbold

Message:

• sequence diagram generation now ignores STARTEVENT and ENDEVENT

File:

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

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

@@ -241 +241 @@
     /**
      * <p>
-     * Extends a given model with an interaction that represents an observed sequence. 
-     * </p>
-     *
-     * @param sequence sequence that is added as sequence diagram
-     * @param model UML model to which the interaction is added
-     * @param interactionName name of the interaction
-     */
-    public static void createInteractionFromEventSequence(List<Event> sequence, Model model, String interactionName)
+     * Extends a given model with an interaction that represents an observed sequence.
+     * </p>
+     * 
+     * @param sequence
+     *            sequence that is added as sequence diagram
+     * @param model
+     *            UML model to which the interaction is added
+     * @param interactionName
+     *            name of the interaction
+     */
+    public static void createInteractionFromEventSequence(List<Event> sequence,
+                                                          Model model,
+                                                          String interactionName)
     {
         Map<String, Class> classMap = new HashMap<>();
@@ -260 +265 @@
 
         Interaction interaction =
-            (Interaction) model
-                .createPackagedElement(interactionName, UMLPackage.Literals.INTERACTION);
+            (Interaction) model.createPackagedElement(interactionName,
+                                                      UMLPackage.Literals.INTERACTION);
 
         Lifeline userLifeline = interaction.createLifeline("user");
@@ -267 +272 @@
         int i = 0;
         for (Event event : sequence) {
-            if (event.getType() instanceof SOAPEventType) {
-                SOAPEventType eventType = (SOAPEventType) event.getType();
-                String serviceName = eventType.getServiceName();
-                String methodName = eventType.getCalledMethod();
-                Class targetClass = classMap.get(serviceName);
-                if (targetClass == null) {
+            if (!(event.equals(Event.STARTEVENT) || event.equals(Event.ENDEVENT))) {
+                if (event.getType() instanceof SOAPEventType) {
+                    SOAPEventType eventType = (SOAPEventType) event.getType();
+                    String serviceName = eventType.getServiceName();
+                    String methodName = eventType.getCalledMethod();
+                    Class targetClass = classMap.get(serviceName);
+                    if (targetClass == null) {
+                        throw new RuntimeException(
+                                                   "Could not find class in the UML model that belong to the service: " +
+                                                       serviceName);
+                    }
+
+                    Lifeline targetLifeline = interaction.getLifeline(serviceName);
+                    if (targetLifeline == null) {
+                        targetLifeline = interaction.createLifeline(serviceName);
+                        Association association =
+                            (Association) model.getPackagedElement("user_" + serviceName, true,
+                                                                   UMLPackage.Literals.ASSOCIATION,
+                                                                   true);
+                        targetLifeline.setRepresents(association.getMemberEnd(serviceName, classMap
+                            .get(serviceName)));
+                    }
+                    MessageOccurrenceSpecification sendFragment =
+                        (MessageOccurrenceSpecification) interaction
+                            .createFragment(i + ":" + methodName + "_sendFragment",
+                                            UMLPackage.Literals.MESSAGE_OCCURRENCE_SPECIFICATION);
+                    MessageOccurrenceSpecification recvFragment =
+                        (MessageOccurrenceSpecification) interaction
+                            .createFragment(i + ":" + methodName + "_recvFragment",
+                                            UMLPackage.Literals.MESSAGE_OCCURRENCE_SPECIFICATION);
+
+                    sendFragment.setCovered(userLifeline);
+                    recvFragment.setCovered(targetLifeline);
+
+                    Message message = interaction.createMessage(methodName);
+                    message.setSignature(getOperationFromName(targetClass.getOperations(),
+                                                              methodName));
+                    message.setSendEvent(sendFragment);
+                    message.setReceiveEvent(recvFragment);
+
+                    sendFragment.setMessage(message);
+                    recvFragment.setMessage(message);
+                }
+                else {
                     throw new RuntimeException(
-                                               "Could not find class in the UML model that belong to the service: " +
-                                                   serviceName);
-                }
-
-                Lifeline targetLifeline = interaction.getLifeline(serviceName);
-                if (targetLifeline == null) {
-                    targetLifeline = interaction.createLifeline(serviceName);
-                    Association association =
-                        (Association) model.getPackagedElement("user_" + serviceName, true,
-                                                               UMLPackage.Literals.ASSOCIATION,
-                                                               true);
-                    targetLifeline
-                        .setRepresents(association.getMemberEnd(serviceName,
-                                                                classMap.get(serviceName)));
-                }
-                MessageOccurrenceSpecification sendFragment =
-                    (MessageOccurrenceSpecification) interaction
-                        .createFragment(i + ":" + methodName + "_sendFragment",
-                                        UMLPackage.Literals.MESSAGE_OCCURRENCE_SPECIFICATION);
-                MessageOccurrenceSpecification recvFragment =
-                    (MessageOccurrenceSpecification) interaction
-                        .createFragment(i + ":" + methodName + "_recvFragment",
-                                        UMLPackage.Literals.MESSAGE_OCCURRENCE_SPECIFICATION);
-
-                sendFragment.setCovered(userLifeline);
-                recvFragment.setCovered(targetLifeline);
-
-                Message message = interaction.createMessage(methodName);
-                message.setSignature(getOperationFromName(targetClass.getOperations(), methodName));
-                message.setSendEvent(sendFragment);
-                message.setReceiveEvent(recvFragment);
-
-                sendFragment.setMessage(message);
-                recvFragment.setMessage(message);
-            }
-            else {
-                throw new RuntimeException(
-                                           "Wrong event type. Only SOAPEventType supported but was: " +
-                                               event.getType().getClass().getName());
-            }
-            i++;
+                                               "Wrong event type. Only SOAPEventType supported but was: " +
+                                                   event.getType().getClass().getName());
+                }
+                i++;
+            }
         }
     }