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

Author: bobtarling
Date: 2010-07-11 10:54:42-0700
New Revision: 18505

Modified:
   trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java
   trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java
   trunk/src/argouml-core-model/src/org/argouml/model/Facade.java

Log:
Provide getter for a UML2 Activity

Modified: trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java?view=diff&pathrev=18505&r1=18504&r2=18505
==============================================================================
--- trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java	(original)
+++ trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java	2010-07-11 10:54:42-0700
@@ -36,6 +36,7 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.uml2.uml.Abstraction;
 import org.eclipse.uml2.uml.Action;
+import org.eclipse.uml2.uml.ActivityNode;
 import org.eclipse.uml2.uml.ActivityPartition;
 import org.eclipse.uml2.uml.Actor;
 import org.eclipse.uml2.uml.AggregationKind;
@@ -196,6 +197,14 @@
 
     }
 
+    public Object getActivity(Object handle) {
+        if (!(handle instanceof ActivityNode)) {
+            throw new IllegalArgumentException(
+                    "handle must be instance of ActivityNode"); //$NON-NLS-1$
+        }
+        return ((ActivityNode) handle).getActivity();
+    }
+    
     public List getActualArguments(Object handle) {
         throw new NotYetImplementedException();
 

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=18505&r1=18504&r2=18505
==============================================================================
--- 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-07-11 10:54:42-0700
@@ -55,6 +55,7 @@
 import javax.jmi.reflect.RefFeatured;
 import javax.jmi.reflect.RefObject;
 import javax.jmi.reflect.RefPackage;
+import javax.naming.OperationNotSupportedException;
 
 import org.apache.log4j.Logger;
 import org.argouml.model.CoreFactory;
@@ -3722,6 +3723,13 @@
     }
 
 
+    public Object getActivity(Object handle) {
+        return new OperationNotSupportedException(
+                "UML 1.x does not support the model element " //$NON-NLS-1$
+                + handle.getClass().getName());
+    }
+
+
     public List getActualArguments(Object handle) {
         try {
             if (handle instanceof Action) {

Modified: trunk/src/argouml-core-model/src/org/argouml/model/Facade.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/Facade.java?view=diff&pathrev=18505&r1=18504&r2=18505
==============================================================================
--- trunk/src/argouml-core-model/src/org/argouml/model/Facade.java	(original)
+++ trunk/src/argouml-core-model/src/org/argouml/model/Facade.java	2010-07-11 10:54:42-0700
@@ -2961,6 +2961,15 @@
      * @return the activityGraph
      */
     Object getActivityGraph(Object handle);
+    
+    /**
+     * Return the Activity of an ActivityNode (UML2 only).
+     * 
+     * @param handle the activitynode
+     * @return the activity
+     */
+    Object getActivity(Object handle);
+    
 
     /**
      * Return the actual arguments for a given action.

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

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