svn commit: r12745 - trunk/src_new/org/argouml: ui uml/diagram/activity/ui uml/diagram/collaboration/ui uml/diagram/deployment/ui uml/diagram/sequence/ui uml/diagram/state/ui uml/diagram/ui uml/diagram/use_case/ui

Author: mvw
Date: 2007-06-02 11:54:08-0700
New Revision: 12745

Added:
   trunk/src_new/org/argouml/uml/diagram/ui/ActionSetMode.java
      - copied, changed from r12652, /trunk/src_new/org/argouml/ui/ActionSetMode.java
Removed:
   trunk/src_new/org/argouml/ui/ActionSetMode.java
Modified:
   trunk/src_new/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java
   trunk/src_new/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java
   trunk/src_new/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java
   trunk/src_new/org/argouml/uml/diagram/sequence/ui/UMLSequenceDiagram.java
   trunk/src_new/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java
   trunk/src_new/org/argouml/uml/diagram/ui/ActionAddAssociationRole.java
   trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddAssociationClassMode.java
   trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddAssociationEndMode.java
   trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddAssociationMode.java
   trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddCommentLinkMode.java
   trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java
   trunk/src_new/org/argouml/uml/diagram/use_case/ui/UMLUseCaseDiagram.java

Log:
Move ActionSetMode to the package where it is used.

Removed: trunk/src_new/org/argouml/ui/ActionSetMode.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/ActionSetMode.java?view=auto&rev=12744

Modified: trunk/src_new/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java?view=diff&rev=12745&p1=trunk/src_new/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java&r1=12744&r2=12745
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java	2007-06-02 11:54:08-0700
@@ -40,7 +40,6 @@
 import org.argouml.model.DeleteInstanceEvent;
 import org.argouml.model.Model;
 import org.argouml.ui.CmdCreateNode;
-import org.argouml.ui.ActionSetMode;
 import org.argouml.uml.diagram.UMLMutableGraphSupport;
 import org.argouml.uml.diagram.activity.ActivityDiagramGraphModel;
 import org.argouml.uml.diagram.state.StateDiagramGraphModel;
@@ -50,6 +49,7 @@
 import org.argouml.uml.diagram.state.ui.ButtonActionNewSignalEvent;
 import org.argouml.uml.diagram.state.ui.ButtonActionNewTimeEvent;
 import org.argouml.uml.diagram.state.ui.FigStateVertex;
+import org.argouml.uml.diagram.ui.ActionSetMode;
 import org.argouml.uml.diagram.ui.RadioAction;
 import org.argouml.uml.diagram.ui.UMLDiagram;
 import org.argouml.uml.ui.behavior.common_behavior.ActionNewActionSequence;

Modified: trunk/src_new/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java?view=diff&rev=12745&p1=trunk/src_new/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java&r1=12744&r2=12745
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java	2007-06-02 11:54:08-0700
@@ -34,10 +34,10 @@
 import org.argouml.i18n.Translator;
 import org.argouml.kernel.ProjectManager;
 import org.argouml.model.Model;
-import org.argouml.ui.ActionSetMode;
 import org.argouml.uml.diagram.collaboration.CollabDiagramGraphModel;
 import org.argouml.uml.diagram.ui.ActionAddAssociationRole;
 import org.argouml.uml.diagram.ui.ActionAddMessage;
+import org.argouml.uml.diagram.ui.ActionSetMode;
 import org.argouml.uml.diagram.ui.FigMessage;
 import org.argouml.uml.diagram.ui.RadioAction;
 import org.argouml.uml.diagram.ui.UMLDiagram;

Modified: trunk/src_new/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java?view=diff&rev=12745&p1=trunk/src_new/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java&r1=12744&r2=12745
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java	2007-06-02 11:54:08-0700
@@ -36,9 +36,9 @@
 import org.argouml.model.Facade;
 import org.argouml.model.Model;
 import org.argouml.ui.CmdCreateNode;
-import org.argouml.ui.ActionSetMode;
 import org.argouml.uml.diagram.deployment.DeploymentDiagramGraphModel;
 import org.argouml.uml.diagram.ui.ActionSetAddAssociationMode;
+import org.argouml.uml.diagram.ui.ActionSetMode;
 import org.argouml.uml.diagram.ui.RadioAction;
 import org.argouml.uml.diagram.ui.UMLDiagram;
 import org.argouml.util.ToolBarUtility;

Modified: trunk/src_new/org/argouml/uml/diagram/sequence/ui/UMLSequenceDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/sequence/ui/UMLSequenceDiagram.java?view=diff&rev=12745&p1=trunk/src_new/org/argouml/uml/diagram/sequence/ui/UMLSequenceDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/sequence/ui/UMLSequenceDiagram.java&r1=12744&r2=12745
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/sequence/ui/UMLSequenceDiagram.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/sequence/ui/UMLSequenceDiagram.java	2007-06-02 11:54:08-0700
@@ -31,8 +31,8 @@
 import org.argouml.i18n.Translator;
 import org.argouml.kernel.ProjectManager;
 import org.argouml.model.Model;
-import org.argouml.ui.ActionSetMode;
 import org.argouml.uml.diagram.sequence.SequenceDiagramGraphModel;
+import org.argouml.uml.diagram.ui.ActionSetMode;
 import org.argouml.uml.diagram.ui.RadioAction;
 import org.argouml.uml.diagram.ui.UMLDiagram;
 import org.tigris.gef.presentation.FigNode;

Modified: trunk/src_new/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java?view=diff&rev=12745&p1=trunk/src_new/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java&r1=12744&r2=12745
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java	2007-06-02 11:54:08-0700
@@ -34,10 +34,10 @@
 import org.argouml.kernel.ProjectManager;
 import org.argouml.model.DeleteInstanceEvent;
 import org.argouml.model.Model;
-import org.argouml.ui.ActionSetMode;
 import org.argouml.ui.CmdCreateNode;
 import org.argouml.uml.diagram.UMLMutableGraphSupport;
 import org.argouml.uml.diagram.state.StateDiagramGraphModel;
+import org.argouml.uml.diagram.ui.ActionSetMode;
 import org.argouml.uml.diagram.ui.RadioAction;
 import org.argouml.uml.diagram.ui.UMLDiagram;
 import org.argouml.uml.ui.behavior.common_behavior.ActionNewActionSequence;

Modified: trunk/src_new/org/argouml/uml/diagram/ui/ActionAddAssociationRole.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/ActionAddAssociationRole.java?view=diff&rev=12745&p1=trunk/src_new/org/argouml/uml/diagram/ui/ActionAddAssociationRole.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/ActionAddAssociationRole.java&r1=12744&r2=12745
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/ActionAddAssociationRole.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/ActionAddAssociationRole.java	2007-06-02 11:54:08-0700
@@ -29,7 +29,6 @@
 
 import org.argouml.application.helpers.ResourceLoaderWrapper;
 import org.argouml.model.Model;
-import org.argouml.ui.ActionSetMode;
 import org.tigris.gef.base.ModeCreatePolyEdge;
 
 

Modified: trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddAssociationClassMode.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddAssociationClassMode.java?view=diff&rev=12745&p1=trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddAssociationClassMode.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddAssociationClassMode.java&r1=12744&r2=12745
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddAssociationClassMode.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddAssociationClassMode.java	2007-06-02 11:54:08-0700
@@ -31,7 +31,6 @@
 
 
 import org.argouml.model.Model;
-import org.argouml.ui.ActionSetMode;
 
 /**
  * An extension of ActionSetMode to set the parameters for an association.

Modified: trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddAssociationEndMode.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddAssociationEndMode.java?view=diff&rev=12745&p1=trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddAssociationEndMode.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddAssociationEndMode.java&r1=12744&r2=12745
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddAssociationEndMode.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddAssociationEndMode.java	2007-06-02 11:54:08-0700
@@ -31,7 +31,6 @@
 
 
 import org.argouml.model.Model;
-import org.argouml.ui.ActionSetMode;
 
 /**
  * An extension of ActionSetMode to create all the parts of an association

Modified: trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddAssociationMode.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddAssociationMode.java?view=diff&rev=12745&p1=trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddAssociationMode.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddAssociationMode.java&r1=12744&r2=12745
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddAssociationMode.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddAssociationMode.java	2007-06-02 11:54:08-0700
@@ -31,7 +31,6 @@
 
 
 import org.argouml.model.Model;
-import org.argouml.ui.ActionSetMode;
 import org.tigris.gef.base.ModeCreatePolyEdge;
 
 /**

Modified: trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddCommentLinkMode.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddCommentLinkMode.java?view=diff&rev=12745&p1=trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddCommentLinkMode.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddCommentLinkMode.java&r1=12744&r2=12745
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddCommentLinkMode.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddCommentLinkMode.java	2007-06-02 11:54:08-0700
@@ -30,7 +30,6 @@
 package org.argouml.uml.diagram.ui;
 
 
-import org.argouml.ui.ActionSetMode;
 import org.argouml.uml.diagram.static_structure.ui.CommentEdge;
 
 /**

Copied: trunk/src_new/org/argouml/uml/diagram/ui/ActionSetMode.java (from r12652, /trunk/src_new/org/argouml/ui/ActionSetMode.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/ActionSetMode.java?view=diff&rev=12745&p1=/trunk/src_new/org/argouml/ui/ActionSetMode.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/ActionSetMode.java&r1=12652&r2=12745
==============================================================================
--- /trunk/src_new/org/argouml/ui/ActionSetMode.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/ActionSetMode.java	2007-06-02 11:54:08-0700
@@ -22,7 +22,7 @@
 // CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
 // UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 
-package org.argouml.ui;
+package org.argouml.uml.diagram.ui;
 
 import java.util.Hashtable;
 import java.util.Properties;
@@ -33,13 +33,14 @@
 import org.apache.log4j.Logger;
 import org.argouml.application.helpers.ResourceLoaderWrapper;
 import org.argouml.i18n.Translator;
+import org.tigris.gef.base.SetModeAction;
 
 /**
  * Extends GEF ActionSetMode to add additional metadata such as tooltips.
  *
  * @author Jeremy Jones
  */
-public class ActionSetMode extends org.tigris.gef.base.SetModeAction {
+public class ActionSetMode extends SetModeAction {
     
     private static final Logger LOG = Logger.getLogger(ActionSetMode.class);
 

Modified: trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java?view=diff&rev=12745&p1=trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java&r1=12744&r2=12745
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java	2007-06-02 11:54:08-0700
@@ -41,7 +41,6 @@
 import org.argouml.model.Model;
 import org.argouml.model.ModelManagementHelper;
 import org.argouml.ui.CmdCreateNode;
-import org.argouml.ui.ActionSetMode;
 import org.argouml.ui.explorer.Relocatable;
 import org.argouml.uml.UUIDHelper;
 import org.argouml.uml.diagram.ArgoDiagram;

Modified: trunk/src_new/org/argouml/uml/diagram/use_case/ui/UMLUseCaseDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/use_case/ui/UMLUseCaseDiagram.java?view=diff&rev=12745&p1=trunk/src_new/org/argouml/uml/diagram/use_case/ui/UMLUseCaseDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/use_case/ui/UMLUseCaseDiagram.java&r1=12744&r2=12745
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/use_case/ui/UMLUseCaseDiagram.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/use_case/ui/UMLUseCaseDiagram.java	2007-06-02 11:54:08-0700
@@ -33,9 +33,9 @@
 import org.argouml.kernel.ProjectManager;
 import org.argouml.model.Model;
 import org.argouml.ui.CmdCreateNode;
-import org.argouml.ui.ActionSetMode;
 import org.argouml.uml.diagram.ui.ActionAddExtensionPoint;
 import org.argouml.uml.diagram.ui.ActionSetAddAssociationMode;
+import org.argouml.uml.diagram.ui.ActionSetMode;
 import org.argouml.uml.diagram.ui.RadioAction;
 import org.argouml.uml.diagram.ui.UMLDiagram;
 import org.argouml.uml.diagram.use_case.UseCaseDiagramGraphModel;