svn commit: r19139 - trunk/src/argouml-app/src/org/argouml/notation/providers/MessageNotation.java

Author: bobtarling
Date: 2011-03-26 04:11:19-0700
New Revision: 19139

Modified:
   trunk/src/argouml-app/src/org/argouml/notation/providers/MessageNotation.java

Log:
UML2 message notation will have to be dealt with later

Modified: trunk/src/argouml-app/src/org/argouml/notation/providers/MessageNotation.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/notation/providers/MessageNotation.java?view=diff&pathrev=19139&r1=19138&r2=19139
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/notation/providers/MessageNotation.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/notation/providers/MessageNotation.java	2011-03-26 04:11:19-0700
@@ -65,34 +65,35 @@
 
     @Override
     public void initialiseListener(Object umlMessage) {
-        addElementListener(umlMessage,
-                new String[] {"activator", "predecessor", "successor", 
-                    "sender", "receiver", "action", "name"});
-        Object action = Model.getFacade().getAction(umlMessage);
-        if (action != null) {
-            addElementListener(action,
-                    new String[] {"remove", "recurrence", "script", 
-                        "actualArgument", "signal", "operation"});
-            List args = Model.getFacade().getActualArguments(action);
-            for (Object argument : args) {
-                addElementListener(argument,
-                        new String[] {"remove", "value"});
-            }
-            if (Model.getFacade().isACallAction(action)) {
-                Object operation = Model.getFacade().getOperation(action);
-                if (Model.getFacade().isAOperation(operation)) {
-                    addElementListener(operation,
-                            new String[] {"name"});
+        if (Model.getFacade().getUmlVersion().charAt(0) == '1') {
+            addElementListener(umlMessage,
+                    new String[] {"activator", "predecessor", "successor", 
+                        "sender", "receiver", "action", "name"});
+            Object action = Model.getFacade().getAction(umlMessage);
+            if (action != null) {
+                addElementListener(action,
+                        new String[] {"remove", "recurrence", "script", 
+                            "actualArgument", "signal", "operation"});
+                List args = Model.getFacade().getActualArguments(action);
+                for (Object argument : args) {
+                    addElementListener(argument,
+                            new String[] {"remove", "value"});
                 }
-            }
-            if (Model.getFacade().isASendAction(action)) {
-                Object signal = Model.getFacade().getSignal(action);
-                if (Model.getFacade().isASignal(signal)) {
-                    addElementListener(signal,
-                            new String[] {"name"});
+                if (Model.getFacade().isACallAction(action)) {
+                    Object operation = Model.getFacade().getOperation(action);
+                    if (Model.getFacade().isAOperation(operation)) {
+                        addElementListener(operation,
+                                new String[] {"name"});
+                    }
+                }
+                if (Model.getFacade().isASendAction(action)) {
+                    Object signal = Model.getFacade().getSignal(action);
+                    if (Model.getFacade().isASignal(signal)) {
+                        addElementListener(signal,
+                                new String[] {"name"});
+                    }
                 }
             }
         }
     }
-
 }

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2714323

To unsubscribe from this discussion, e-mail: [[email protected]].