Author: tfmorris
Date: 2007-05-04 10:51:07-0700
New Revision: 12533
Added:
trunk/src_new/org/argouml/ui/ActionSetMode.java
- copied, changed from r12532, /trunk/src_new/org/argouml/ui/SetModeAction.java
Removed:
trunk/src_new/org/argouml/ui/SetModeAction.java
Modified:
trunk/src_new/org/argouml/ui/CmdSetMode.java
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:
Rename SetModeAction to conform to ArgoUML conventions instead of GEF conventions
Copied: trunk/src_new/org/argouml/ui/ActionSetMode.java (from r12532, /trunk/src_new/org/argouml/ui/SetModeAction.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/ActionSetMode.java?view=diff&rev=12533&p1=/trunk/src_new/org/argouml/ui/SetModeAction.java&p2=trunk/src_new/org/argouml/ui/ActionSetMode.java&r1=12532&r2=12533
==============================================================================
--- /trunk/src_new/org/argouml/ui/SetModeAction.java (original)
+++ trunk/src_new/org/argouml/ui/ActionSetMode.java 2007-05-04 10:51:07-0700
@@ -34,18 +34,18 @@
import org.argouml.i18n.Translator;
/**
- * Extends GEF SetModeAction to add additional metadata such as tooltips.
+ * Extends GEF ActionSetMode to add additional metadata such as tooltips.
*
* @author Jeremy Jones
*/
-public class SetModeAction extends org.tigris.gef.base.SetModeAction {
+public class ActionSetMode extends org.tigris.gef.base.SetModeAction {
/**
* The constructor.
*
* @param args arguments
*/
- public SetModeAction(Properties args) {
+ public ActionSetMode(Properties args) {
super(args);
}
@@ -54,7 +54,7 @@
*
* @param modeClass the next global editor mode
*/
- public SetModeAction(Class modeClass) {
+ public ActionSetMode(Class modeClass) {
super(modeClass);
}
@@ -64,7 +64,7 @@
* @param modeClass the next global editor mode
* @param name the name of the command that is the tooltip text.
*/
- public SetModeAction(Class modeClass, String name) {
+ public ActionSetMode(Class modeClass, String name) {
super(modeClass, ResourceLoaderWrapper.getImageBinding(name));
putToolTip(name);
}
@@ -76,7 +76,7 @@
* @param name the to be localized name of the command
* @param tooltipkey The key for the tooltip text.
*/
- public SetModeAction(Class modeClass, String name, String tooltipkey) {
+ public ActionSetMode(Class modeClass, String name, String tooltipkey) {
super(modeClass, name);
putToolTip(tooltipkey);
}
@@ -88,7 +88,7 @@
* @param sticky the global sticky mode boolean allows the user
* to place several nodes rapidly (in succession)
*/
- public SetModeAction(Class modeClass, boolean sticky) {
+ public ActionSetMode(Class modeClass, boolean sticky) {
super(modeClass, sticky);
}
@@ -98,7 +98,7 @@
* @param modeClass the next global editor mode
* @param modeArgs arguments for the new mode
*/
- public SetModeAction(Class modeClass, Hashtable modeArgs) {
+ public ActionSetMode(Class modeClass, Hashtable modeArgs) {
super(modeClass, modeArgs);
}
@@ -109,7 +109,7 @@
* @param modeArgs arguments for the new mode
* @param name the name of the command that is the tooltip text.
*/
- public SetModeAction(Class modeClass, Hashtable modeArgs, String name) {
+ public ActionSetMode(Class modeClass, Hashtable modeArgs, String name) {
super(modeClass, ResourceLoaderWrapper.getImageBinding(name));
this.modeArgs = modeArgs;
putToolTip(name);
@@ -122,7 +122,7 @@
* @param arg the name of a new argument for the new mode
* @param value the value of a new argument for the new mode
*/
- public SetModeAction(Class modeClass, String arg, Object value) {
+ public ActionSetMode(Class modeClass, String arg, Object value) {
super(modeClass, arg, value);
}
@@ -134,7 +134,7 @@
* @param value the value of a new argument for the new mode
* @param name the name of the command that is the tooltip text.
*/
- public SetModeAction(Class modeClass, String arg, Object value,
+ public ActionSetMode(Class modeClass, String arg, Object value,
String name) {
super(modeClass, arg, value, ResourceLoaderWrapper
.getImageBinding(name));
@@ -150,7 +150,7 @@
* @param name the name of the command that is the tooltip text.
* @param icon the SMALL_ICON for the action
*/
- public SetModeAction(
+ public ActionSetMode(
Class modeClass,
String arg,
Object value,
Modified: trunk/src_new/org/argouml/ui/CmdSetMode.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/CmdSetMode.java?view=diff&rev=12533&p1=trunk/src_new/org/argouml/ui/CmdSetMode.java&p2=trunk/src_new/org/argouml/ui/CmdSetMode.java&r1=12532&r2=12533
==============================================================================
--- trunk/src_new/org/argouml/ui/CmdSetMode.java (original)
+++ trunk/src_new/org/argouml/ui/CmdSetMode.java 2007-05-04 10:51:07-0700
@@ -37,7 +37,7 @@
* Extends GEF CmdSetMode to add additional metadata such as tooltips.
*
* @author Jeremy Jones
- * @deprecated for 0.25.3 by tfmorris - use {@link SetModeAction}
+ * @deprecated for 0.25.3 by tfmorris - use {@link ActionSetMode}
*/
public class CmdSetMode extends org.tigris.gef.base.CmdSetMode {
Removed: trunk/src_new/org/argouml/ui/SetModeAction.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/SetModeAction.java?view=auto&rev=12532
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=12533&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=12532&r2=12533
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java 2007-05-04 10:51:07-0700
@@ -39,7 +39,7 @@
import org.argouml.model.DeleteInstanceEvent;
import org.argouml.model.Model;
import org.argouml.ui.CmdCreateNode;
-import org.argouml.ui.SetModeAction;
+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;
@@ -513,7 +513,7 @@
if (actionTransition == null) {
actionTransition =
new RadioAction(
- new SetModeAction(
+ new ActionSetMode(
ModeCreatePolyEdge.class,
"edgeClass",
Model.getMetaTypes().getTransition(),
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=12533&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=12532&r2=12533
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java 2007-05-04 10:51:07-0700
@@ -34,7 +34,7 @@
import org.argouml.i18n.Translator;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
-import org.argouml.ui.SetModeAction;
+import org.argouml.ui.ActionSetMode;
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.collaboration.CollabDiagramGraphModel;
import org.argouml.uml.diagram.ui.ActionAddAssociationRole;
@@ -304,7 +304,7 @@
if (actionDepend == null) {
actionDepend =
new RadioAction(
- new SetModeAction(
+ new ActionSetMode(
ModeCreatePolyEdge.class,
"edgeClass",
Model.getMetaTypes().getDependency(),
@@ -319,7 +319,7 @@
if (actionGeneralize == null) {
actionGeneralize =
new RadioAction(
- new SetModeAction(
+ new ActionSetMode(
ModeCreatePolyEdge.class,
"edgeClass",
Model.getMetaTypes().getGeneralization(),
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=12533&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=12532&r2=12533
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java 2007-05-04 10:51:07-0700
@@ -36,7 +36,7 @@
import org.argouml.model.Facade;
import org.argouml.model.Model;
import org.argouml.ui.CmdCreateNode;
-import org.argouml.ui.SetModeAction;
+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.RadioAction;
@@ -265,7 +265,7 @@
protected Action getActionMAssociation() {
if (actionMAssociation == null) {
actionMAssociation =
- new RadioAction(new SetModeAction(
+ new RadioAction(new ActionSetMode(
ModeCreatePolyEdge.class,
"edgeClass",
Model.getMetaTypes().getAssociation(),
@@ -320,7 +320,7 @@
protected Action getActionMDependency() {
if (actionMDependency == null) {
actionMDependency =
- new RadioAction(new SetModeAction(
+ new RadioAction(new ActionSetMode(
ModeCreatePolyEdge.class,
"edgeClass",
Model.getMetaTypes().getDependency(),
@@ -335,7 +335,7 @@
protected Action getActionMGeneralization() {
if (actionMGeneralization == null) {
actionMGeneralization =
- new RadioAction(new SetModeAction(
+ new RadioAction(new ActionSetMode(
ModeCreatePolyEdge.class,
"edgeClass",
Model.getMetaTypes().getGeneralization(),
@@ -350,7 +350,7 @@
protected Action getActionMAbstraction() {
if (actionMAbstraction == null) {
actionMAbstraction =
- new RadioAction(new SetModeAction(
+ new RadioAction(new ActionSetMode(
ModeCreatePolyEdge.class,
"edgeClass",
Model.getMetaTypes().getAbstraction(),
@@ -379,7 +379,7 @@
protected Action getActionMLink() {
if (actionMLink == null) {
actionMLink =
- new RadioAction(new SetModeAction(
+ new RadioAction(new ActionSetMode(
ModeCreatePolyEdge.class,
"edgeClass",
Model.getMetaTypes().getLink(),
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=12533&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=12532&r2=12533
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/sequence/ui/UMLSequenceDiagram.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/sequence/ui/UMLSequenceDiagram.java 2007-05-04 10:51:07-0700
@@ -31,7 +31,7 @@
import org.argouml.i18n.Translator;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
-import org.argouml.ui.SetModeAction;
+import org.argouml.ui.ActionSetMode;
import org.argouml.uml.diagram.sequence.SequenceDiagramGraphModel;
import org.argouml.uml.diagram.static_structure.ClassDiagramGraphModel;
import org.argouml.uml.diagram.ui.RadioAction;
@@ -161,20 +161,20 @@
ResourceLoaderWrapper
.getImageBinding((String) actionList[i][1]));
actions[i + offset] =
- new RadioAction(new SetModeAction(
+ new RadioAction(new ActionSetMode(
ModeCreateMessage.class, args,
(String) actionList[i][1]));
}
Hashtable args = new Hashtable();
args.put("name", SEQUENCE_EXPAND_BUTTON);
actions[5] =
- new RadioAction(new SetModeAction(ModeChangeHeight.class,
+ new RadioAction(new ActionSetMode(ModeChangeHeight.class,
args,
SEQUENCE_EXPAND_BUTTON));
args = new Hashtable();
args.put("name", SEQUENCE_CONTRACT_BUTTON);
actions[6] =
- new RadioAction(new SetModeAction(ModeChangeHeight.class,
+ new RadioAction(new ActionSetMode(ModeChangeHeight.class,
args,
SEQUENCE_CONTRACT_BUTTON));
}
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=12533&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=12532&r2=12533
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java 2007-05-04 10:51:07-0700
@@ -35,7 +35,7 @@
import org.argouml.model.DeleteInstanceEvent;
import org.argouml.model.Model;
import org.argouml.ui.CmdCreateNode;
-import org.argouml.ui.SetModeAction;
+import org.argouml.ui.ActionSetMode;
import org.argouml.uml.diagram.UMLMutableGraphSupport;
import org.argouml.uml.diagram.state.StateDiagramGraphModel;
import org.argouml.uml.diagram.static_structure.ClassDiagramGraphModel;
@@ -583,7 +583,7 @@
protected Action getActionTransition() {
if (actionTransition == null) {
actionTransition = new RadioAction(
- new SetModeAction(
+ new ActionSetMode(
ModeCreatePolyEdge.class,
"edgeClass",
Model.getMetaTypes().getTransition(),
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=12533&p1=trunk/src_new/org/argouml/uml/diagram/ui/ActionAddAssociationRole.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/ActionAddAssociationRole.java&r1=12532&r2=12533
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/ActionAddAssociationRole.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/ActionAddAssociationRole.java 2007-05-04 10:51:07-0700
@@ -29,20 +29,20 @@
import org.argouml.application.helpers.ResourceLoaderWrapper;
import org.argouml.model.Model;
-import org.argouml.ui.SetModeAction;
+import org.argouml.ui.ActionSetMode;
import org.tigris.gef.base.ModeCreatePolyEdge;
/**
* The ActionAddAssociation class is for creating a dummy link with a
* stimulus and a given action type. This is done in one step when a
- * new edge between two nodes is instanciated
+ * new edge between two nodes is instantiated.
*
* Created on 15 February 2003, 01:01
*
* @author Bob Tarling
*/
-public class ActionAddAssociationRole extends SetModeAction {
+public class ActionAddAssociationRole extends ActionSetMode {
/**
* Serial versoin generated for rev 1.14
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=12533&p1=trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddAssociationClassMode.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddAssociationClassMode.java&r1=12532&r2=12533
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddAssociationClassMode.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddAssociationClassMode.java 2007-05-04 10:51:07-0700
@@ -31,15 +31,15 @@
import org.argouml.model.Model;
-import org.argouml.ui.SetModeAction;
+import org.argouml.ui.ActionSetMode;
/**
- * An extension of SetModeAction to set the parameters for an association.
+ * An extension of ActionSetMode to set the parameters for an association.
*
* @author Bob Tarling
*/
-public class ActionSetAddAssociationClassMode extends SetModeAction {
+public class ActionSetAddAssociationClassMode extends ActionSetMode {
private static final long serialVersionUID = -884044085661992872L;
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=12533&p1=trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddAssociationEndMode.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddAssociationEndMode.java&r1=12532&r2=12533
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddAssociationEndMode.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddAssociationEndMode.java 2007-05-04 10:51:07-0700
@@ -31,16 +31,16 @@
import org.argouml.model.Model;
-import org.argouml.ui.SetModeAction;
+import org.argouml.ui.ActionSetMode;
/**
- * An extension of SetModeAction to create all the parts of an association
+ * An extension of ActionSetMode to create all the parts of an association
* class.
*
* @author Bob Tarling
*/
-public class ActionSetAddAssociationEndMode extends SetModeAction {
+public class ActionSetAddAssociationEndMode extends ActionSetMode {
private static final long serialVersionUID = 2908695768709766241L;
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=12533&p1=trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddAssociationMode.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddAssociationMode.java&r1=12532&r2=12533
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddAssociationMode.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddAssociationMode.java 2007-05-04 10:51:07-0700
@@ -31,16 +31,16 @@
import org.argouml.model.Model;
-import org.argouml.ui.SetModeAction;
+import org.argouml.ui.ActionSetMode;
import org.tigris.gef.base.ModeCreatePolyEdge;
/**
- * An extension of SetModeAction to set the parameters for an association.
+ * An extension of ActionSetMode to set the parameters for an association.
*
* @author Bob Tarling
*/
-public class ActionSetAddAssociationMode extends SetModeAction {
+public class ActionSetAddAssociationMode extends ActionSetMode {
/**
* Serial version generated for rev. 1.2
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=12533&p1=trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddCommentLinkMode.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddCommentLinkMode.java&r1=12532&r2=12533
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddCommentLinkMode.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/ActionSetAddCommentLinkMode.java 2007-05-04 10:51:07-0700
@@ -30,16 +30,16 @@
package org.argouml.uml.diagram.ui;
-import org.argouml.ui.SetModeAction;
+import org.argouml.ui.ActionSetMode;
import org.argouml.uml.diagram.static_structure.ui.CommentEdge;
/**
- * An extension of SetModeAction to set the parameters for a comment link.
+ * An extension of ActionSetMode to set the parameters for a comment link.
*
* @author Bob Tarling
*/
-public class ActionSetAddCommentLinkMode extends SetModeAction {
+public class ActionSetAddCommentLinkMode extends ActionSetMode {
/**
* Construct a new ActionSetAddCommentLinkMode.<p>
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=12533&p1=trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java&r1=12532&r2=12533
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java 2007-05-04 10:51:07-0700
@@ -42,7 +42,7 @@
import org.argouml.model.ModelManagementHelper;
import org.argouml.ui.ArgoDiagram;
import org.argouml.ui.CmdCreateNode;
-import org.argouml.ui.SetModeAction;
+import org.argouml.ui.ActionSetMode;
import org.argouml.ui.explorer.Relocatable;
import org.argouml.uml.UUIDHelper;
import org.argouml.uml.diagram.UMLMutableGraphSupport;
@@ -144,41 +144,41 @@
private static Action actionSelect =
- new SetModeAction(ModeSelect.class, "button.select");
+ new ActionSetMode(ModeSelect.class, "button.select");
private static Action actionBroom =
- new SetModeAction(ModeBroom.class, "button.broom");
+ new ActionSetMode(ModeBroom.class, "button.broom");
private static Action actionRectangle =
- new RadioAction(new SetModeAction(ModeCreateFigRect.class, "Rectangle",
+ new RadioAction(new ActionSetMode(ModeCreateFigRect.class, "Rectangle",
"misc.primitive.rectangle"));
private static Action actionRRectangle =
- new RadioAction(new SetModeAction(ModeCreateFigRRect.class, "RRect",
+ new RadioAction(new ActionSetMode(ModeCreateFigRRect.class, "RRect",
"misc.primitive.rounded-rectangle"));
private static Action actionCircle =
- new RadioAction(new SetModeAction(ModeCreateFigCircle.class, "Circle",
+ new RadioAction(new ActionSetMode(ModeCreateFigCircle.class, "Circle",
"misc.primitive.circle"));
private static Action actionLine =
- new RadioAction(new SetModeAction(ModeCreateFigLine.class, "Line",
+ new RadioAction(new ActionSetMode(ModeCreateFigLine.class, "Line",
"misc.primitive.line"));
private static Action actionText =
- new RadioAction(new SetModeAction(ModeCreateFigText.class, "Text",
+ new RadioAction(new ActionSetMode(ModeCreateFigText.class, "Text",
"misc.primitive.text"));
private static Action actionPoly =
- new RadioAction(new SetModeAction(ModeCreateFigPoly.class, "Polygon",
+ new RadioAction(new ActionSetMode(ModeCreateFigPoly.class, "Polygon",
"misc.primitive.polygon"));
private static Action actionSpline =
- new RadioAction(new SetModeAction(ModeCreateFigSpline.class, "Spline",
+ new RadioAction(new ActionSetMode(ModeCreateFigSpline.class, "Spline",
"misc.primitive.spline"));
private static Action actionInk =
- new RadioAction(new SetModeAction(ModeCreateFigInk.class, "Ink",
+ new RadioAction(new ActionSetMode(ModeCreateFigInk.class, "Ink",
"misc.primitive.ink"));
////////////////////////////////////////////////////////////////
@@ -531,7 +531,7 @@
*/
protected Action makeCreateEdgeAction(Object modelElement, String descr) {
return new RadioAction(
- new SetModeAction(ModeCreatePolyEdge.class, "edgeClass",
+ new ActionSetMode(ModeCreatePolyEdge.class, "edgeClass",
modelElement, descr));
}
@@ -549,7 +549,7 @@
Object metaType,
String descr) {
return new RadioAction(
- new SetModeAction(modeClass, "edgeClass", metaType, descr));
+ new ActionSetMode(modeClass, "edgeClass", metaType, descr));
}
/**
@@ -559,7 +559,7 @@
*/
protected Action makeCreateGeneralizationAction() {
return new RadioAction(
- new SetModeAction(
+ new ActionSetMode(
ModeCreateGeneralization.class,
"edgeClass",
Model.getMetaTypes().getGeneralization(),
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=12533&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=12532&r2=12533
==============================================================================
--- 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-05-04 10:51:07-0700
@@ -33,7 +33,7 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.ui.CmdCreateNode;
-import org.argouml.ui.SetModeAction;
+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.RadioAction;
@@ -327,7 +327,7 @@
protected Action getActionDependency() {
if (actionDependency == null) {
actionDependency = new RadioAction(
- new SetModeAction(
+ new ActionSetMode(
ModeCreatePolyEdge.class,
"edgeClass",
Model.getMetaTypes().getDependency(),
@@ -341,7 +341,7 @@
protected Action getActionExtend() {
if (actionExtend == null) {
actionExtend = new RadioAction(
- new SetModeAction(
+ new ActionSetMode(
ModeCreatePolyEdge.class,
"edgeClass",
Model.getMetaTypes().getExtend(),
@@ -355,7 +355,7 @@
protected Action getActionGeneralize() {
if (actionGeneralize == null) {
actionGeneralize = new RadioAction(
- new SetModeAction(
+ new ActionSetMode(
ModeCreatePolyEdge.class,
"edgeClass",
Model.getMetaTypes().getGeneralization(),
@@ -369,7 +369,7 @@
protected Action getActionInclude() {
if (actionInclude == null) {
actionInclude = new RadioAction(
- new SetModeAction(
+ new ActionSetMode(
ModeCreatePolyEdge.class,
"edgeClass",
Model.getMetaTypes().getInclude(),
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.