svn commit: r18571 - trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/UMLActivityDiagram.java

Author: bobtarling
Date: 2010-07-24 16:00:06-0700
New Revision: 18571

Modified:
   trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/UMLActivityDiagram.java

Log:
We allow an kind of ActivityNode on this diagram

Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/UMLActivityDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/UMLActivityDiagram.java?view=diff&pathrev=18571&r1=18570&r2=18571
==============================================================================
--- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/UMLActivityDiagram.java	(original)
+++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/UMLActivityDiagram.java	2010-07-24 16:00:06-0700
@@ -53,17 +53,18 @@
         };
     }
 
-
     @Override
     Object[] getNewNodeTypes() {
         return new Object[] {
-            Model.getMetaTypes().getObjectNode(),
             Model.getMetaTypes().getCallBehaviorAction(),
             Model.getMetaTypes().getCreateObjectAction(),
             Model.getMetaTypes().getDestroyObjectAction(),
             Model.getMetaTypes().getAcceptEventAction(),
             Model.getMetaTypes().getSendSignalAction(),
-            Model.getMetaTypes().getDestroyObjectAction()
+            Model.getMetaTypes().getDestroyObjectAction(),
+            Model.getMetaTypes().getActivityParameterNode(),
+            Model.getMetaTypes().getCentralBufferNode(),
+            Model.getMetaTypes().getDataStoreNode(),
         };
     }
 
@@ -73,7 +74,6 @@
         super.initialize(owner);
         ActivityDiagramGraphModel gm =
             (ActivityDiagramGraphModel) getGraphModel();
-        gm.setOwner(owner);
     }
 
     @Override
@@ -85,7 +85,7 @@
     public boolean doesAccept(Object objectToAccept) {
         if (Model.getFacade().isAComment(objectToAccept)
                 || Model.getFacade().isAActivityEdge(objectToAccept) 
-                || Model.getFacade().isAAction(objectToAccept) ) {
+                || Model.getFacade().isAActivityNode(objectToAccept) ) {
             return true;
         }
         return false;
@@ -99,7 +99,7 @@
         
         DiagramSettings settings = getDiagramSettings();
         
-        if (Model.getFacade().isAAction(modelElement)) {
+        if (Model.getFacade().isAActivityNode(modelElement)) {
             figNode = new FigActivityNode(modelElement, bounds, settings);
         } else if (Model.getFacade().isAComment(modelElement)) {
             figNode = new FigComment(modelElement, bounds, settings);

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

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