svn commit: r18151 - trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java

Author: bobtarling
Date: 2010-03-24 10:21:33-0700
New Revision: 18151

Modified:
   trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java

Log:
Set the namespace of new triggers

Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java?view=diff&pathrev=18151&r1=18150&r2=18151
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java	(original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java	2010-03-24 10:21:33-0700
@@ -757,16 +757,16 @@
             ((Transition) container).setEffect((Action) element);
         } else if (elementType == metaTypes.getCallEvent()) {
             element = Model.getStateMachinesFactory().createCallEvent();
-            ((Transition) container).setTrigger((Event) element);
+            setNewTrigger((Transition) container, (Event) element);
         } else if (elementType == metaTypes.getChangeEvent()) {
             element = Model.getStateMachinesFactory().createChangeEvent();
-            ((Transition) container).setTrigger((Event) element);
+            setNewTrigger((Transition) container, (Event) element);
         } else if (elementType == metaTypes.getSignalEvent()) {
             element = Model.getStateMachinesFactory().createSignalEvent();
-            ((Transition) container).setTrigger((Event) element);
+            setNewTrigger((Transition) container, (Event) element);
         } else if (elementType == metaTypes.getTimeEvent()) {
             element = Model.getStateMachinesFactory().createTimeEvent();
-            ((Transition) container).setTrigger((Event) element);
+            setNewTrigger((Transition) container, (Event) element);
         } else {
             // build all other elements using existing buildNode
             element = buildNode(elementType);
@@ -783,6 +783,19 @@
         return element;
     }
     
+    /**
+     * Add a newly created event to a trigger
+     * @param transition
+     * @param event
+     */
+    private void setNewTrigger(Transition transition, Event event) {
+        transition.setTrigger(event);
+        event.setName("");
+        final StateMachine statemachine = transition.getStateMachine();
+        final Namespace namespace = statemachine.getNamespace();
+        event.setNamespace(namespace);
+    }
+    
     public boolean isConnectionType(Object connectionType) {
         // If our map has any entries for this type, it's a connection type
         return (validConnectionMap.get(connectionType) != null);

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

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