Changeset 1916 for trunk/autoquest-plugin-uml/src

Timestamp:

03/12/15 15:24:31 (10 years ago)

Author:

sherbold

Message:

• fixed bug; should now be working with SimpleSOAPEventType again

File:

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

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

@@ -135 +135 @@
         for (List<Event> sequence : sequences) {
             for (Event event : sequence) {
-                if (event.getType() instanceof SOAPEventType) {
-                    SOAPEventType eventType = (SOAPEventType) event.getType();
-                    Set<String> curCalledMethods = calledMethods.get(eventType.getServiceName());
+                String serviceName = getServiceNameFromEvent(event);
+                String calledMethod = getCalledMethodFromEvent(event);
+                if( serviceName!=null ) {
+                    Set<String> curCalledMethods = calledMethods.get(serviceName);
                     if (curCalledMethods == null) {
                         curCalledMethods = new TreeSet<>();
-                        calledMethods.put(eventType.getServiceName(), curCalledMethods);
-                    }
-                    curCalledMethods.add(eventType.getCalledMethod());
+                        calledMethods.put(serviceName, curCalledMethods);
+                    }
+                    curCalledMethods.add(calledMethod);
                 }
             }
@@ -1014 +1015 @@
             ubtInstSpecPkg = (Package) type.getModel().createPackagedElement(pkgUBTInstSpecs, UMLPackage.Literals.PACKAGE);
         }
-        String serviceName = ((SOAPEventType) event.getType()).getServiceName();
+        String serviceName = getServiceNameFromEvent(event);
         Package serviceInstSpecPkg = (Package) ubtInstSpecPkg.getOwnedMember(serviceName);
         if( serviceInstSpecPkg==null ) {