svn commit: r18132 - trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr

Author: bobtarling
Date: 2010-03-22 07:12:34-0700
New Revision: 18132

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

Log:
Allow arguments to be added to actions in UML1.4 (remove from UML2)

Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java?view=diff&pathrev=18132&r1=18131&r2=18132
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java	(original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java	2010-03-22 07:12:34-0700
@@ -4448,6 +4448,8 @@
         try {
             if (handle instanceof Binding) {
                 return ((Binding) handle).getArgument();
+            } else if (handle instanceof Action) {
+                return ((Action) handle).getActualArgument();
             }
         } catch (InvalidObjectException e) {
             throw new InvalidElementException(e);

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=18132&r1=18131&r2=18132
==============================================================================
--- 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-22 07:12:34-0700
@@ -72,6 +72,7 @@
 import org.omg.uml.behavioralelements.collaborations.Message;
 import org.omg.uml.behavioralelements.commonbehavior.Action;
 import org.omg.uml.behavioralelements.commonbehavior.ActionSequence;
+import org.omg.uml.behavioralelements.commonbehavior.Argument;
 import org.omg.uml.behavioralelements.commonbehavior.AttributeLink;
 import org.omg.uml.behavioralelements.commonbehavior.CallAction;
 import org.omg.uml.behavioralelements.commonbehavior.ComponentInstance;
@@ -446,6 +447,48 @@
                 new Class<?>[] { 
                     Message.class
                 });
+        
+        // specifies valid elements for an AssociationRole to contain
+        validContainmentMap.put(CallAction.class, 
+                new Class<?>[] { 
+                    Argument.class
+                });
+        
+        // specifies valid elements for an AssociationRole to contain
+        validContainmentMap.put(UninterpretedAction.class, 
+                new Class<?>[] { 
+                    Argument.class
+                });
+        
+        // specifies valid elements for an AssociationRole to contain
+        validContainmentMap.put(ReturnAction.class, 
+                new Class<?>[] { 
+                    Argument.class
+                });
+        
+        // specifies valid elements for an AssociationRole to contain
+        validContainmentMap.put(DestroyAction.class, 
+                new Class<?>[] { 
+                    Argument.class
+                });
+        
+        // specifies valid elements for an AssociationRole to contain
+        validContainmentMap.put(SendAction.class, 
+                new Class<?>[] { 
+                    Argument.class
+                });
+        
+        // specifies valid elements for an AssociationRole to contain
+        validContainmentMap.put(TerminateAction.class, 
+                new Class<?>[] { 
+                    Argument.class
+                });
+        
+        // specifies valid elements for an AssociationRole to contain
+        validContainmentMap.put(ActionSequence.class, 
+                new Class<?>[] { 
+                    Argument.class
+                });
     }
         
     public Object buildConnection(Object elementType, Object fromElement,
@@ -664,6 +707,9 @@
             element =
                 Model.getCollaborationsFactory()
                     .buildMessage(collaboration, container);
+        } else if (elementType == metaTypes.getArgument()) {
+            element = Model.getCommonBehaviorFactory().createArgument();
+            Model.getCommonBehaviorHelper().addActualArgument(container, element);
         } else {
             // build all other elements using existing buildNode
             element = buildNode(elementType);

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

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