svn commit: r19407 - trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java

Author: bobtarling
Date: 2011-05-11 10:33:13-0700
New Revision: 19407

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java

Log:
Remove tools not relevant for UML2

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java?view=diff&pathrev=19407&r1=19406&r2=19407
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java	2011-05-11 10:33:13-0700
@@ -38,7 +38,6 @@
 
 package org.argouml.uml.diagram.deployment.ui;
 
-import java.awt.Point;
 import java.awt.Rectangle;
 import java.beans.PropertyVetoException;
 import java.util.ArrayList;
@@ -57,15 +56,12 @@
 import org.argouml.uml.diagram.static_structure.ui.FigClass;
 import org.argouml.uml.diagram.static_structure.ui.FigComment;
 import org.argouml.uml.diagram.static_structure.ui.FigInterface;
-import org.argouml.uml.diagram.static_structure.ui.FigPackage;
 import org.argouml.uml.diagram.ui.ActionSetAddAssociationMode;
 import org.argouml.uml.diagram.ui.ActionSetMode;
-import org.argouml.uml.diagram.ui.FigNodeAssociation;
 import org.argouml.uml.diagram.ui.FigNodeModelElement;
 import org.argouml.uml.diagram.ui.RadioAction;
 import org.argouml.uml.diagram.ui.UMLDiagram;
 import org.argouml.uml.diagram.use_case.ui.FigActor;
-import org.argouml.uml.diagram.use_case.ui.FigUseCase;
 import org.argouml.util.ToolBarUtility;
 import org.tigris.gef.base.LayerPerspective;
 import org.tigris.gef.base.LayerPerspectiveMutable;
@@ -188,19 +184,33 @@
      * @see org.argouml.uml.diagram.ui.UMLDiagram#getUmlActions()
      */
     protected Object[] getUmlActions() {
-        Object[] actions = {
-            getActionMNode(),
-            getActionMNodeInstance(),
-            getActionMComponent(),
-            getActionMComponentInstance(),
-            getActionMGeneralization(),
-            getActionMAbstraction(),
-            getActionMDependency(),
-            getAssociationActions(),
-            getActionMObject(),
-            getActionMLink(),
-        };
-        return actions;
+        if (Model.getFacade().getUmlVersion().startsWith("1")) {
+            final Object[] actions = {
+                getActionMNode(),
+                getActionMNodeInstance(),
+                getActionMComponent(),
+                getActionMComponentInstance(),
+                getActionMGeneralization(),
+                getActionMAbstraction(),
+                getActionMDependency(),
+                getAssociationActions(),
+                getActionMObject(),
+                getActionMLink(),
+            };
+            return actions;
+        } else {
+            final Object[] actions = {
+                    getActionMNode(),
+                    getActionMComponent(),
+                    getActionMGeneralization(),
+                    getActionMAbstraction(),
+                    getActionMDependency(),
+                    getAssociationActions(),
+                    getActionMObject(),
+                    getActionMLink(),
+                };
+            return actions;
+        }
     }
 
     private Object[] getAssociationActions() {

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

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