Author: tfmorris
Date: 2007-05-04 09:40:56-0700
New Revision: 12524
Added:
trunk/src_new/org/argouml/ui/SetModeAction.java
- copied, changed from r12514, /trunk/src_new/org/argouml/ui/CmdSetMode.java
Removed:
trunk/src_new/org/argouml/ui/CmdSetMode.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/UMLDiagram.java
trunk/src_new/org/argouml/uml/diagram/use_case/ui/UMLUseCaseDiagram.java
Log:
Remove use of deprecated class CmdSetMode and rename to align with new superclass name
Removed: 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=auto&rev=12523
Copied: trunk/src_new/org/argouml/ui/SetModeAction.java (from r12514, /trunk/src_new/org/argouml/ui/CmdSetMode.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/SetModeAction.java?view=diff&rev=12524&p1=/trunk/src_new/org/argouml/ui/CmdSetMode.java&p2=trunk/src_new/org/argouml/ui/SetModeAction.java&r1=12514&r2=12524
==============================================================================
--- /trunk/src_new/org/argouml/ui/CmdSetMode.java (original)
+++ trunk/src_new/org/argouml/ui/SetModeAction.java 2007-05-04 09:40:56-0700
@@ -34,18 +34,18 @@
import org.argouml.i18n.Translator;
/**
- * Extends GEF CmdSetMode to add additional metadata such as tooltips.
+ * Extends GEF SetModeAction to add additional metadata such as tooltips.
*
* @author Jeremy Jones
*/
-public class CmdSetMode extends org.tigris.gef.base.CmdSetMode {
+public class SetModeAction extends org.tigris.gef.base.SetModeAction {
/**
* The constructor.
*
* @param args arguments
*/
- public CmdSetMode(Properties args) {
+ public SetModeAction(Properties args) {
super(args);
}
@@ -54,7 +54,7 @@
*
* @param modeClass the next global editor mode
*/
- public CmdSetMode(Class modeClass) {
+ public SetModeAction(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 CmdSetMode(Class modeClass, String name) {
+ public SetModeAction(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 CmdSetMode(Class modeClass, String name, String tooltipkey) {
+ public SetModeAction(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 CmdSetMode(Class modeClass, boolean sticky) {
+ public SetModeAction(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 CmdSetMode(Class modeClass, Hashtable modeArgs) {
+ public SetModeAction(Class modeClass, Hashtable modeArgs) {
super(modeClass, modeArgs);
}
@@ -109,9 +109,9 @@
* @param modeArgs arguments for the new mode
* @param name the name of the command that is the tooltip text.
*/
- public CmdSetMode(Class modeClass, Hashtable modeArgs, String name) {
+ public SetModeAction(Class modeClass, Hashtable modeArgs, String name) {
super(modeClass, ResourceLoaderWrapper.getImageBinding(name));
- _modeArgs = modeArgs;
+ 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 CmdSetMode(Class modeClass, String arg, Object value) {
+ public SetModeAction(Class modeClass, String arg, Object value) {
super(modeClass, arg, value);
}
@@ -134,9 +134,10 @@
* @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 CmdSetMode(Class modeClass, String arg, Object value, String name) {
- super(modeClass, arg, value,
- ResourceLoaderWrapper.getImageBinding(name));
+ public SetModeAction(Class modeClass, String arg, Object value,
+ String name) {
+ super(modeClass, arg, value, ResourceLoaderWrapper
+ .getImageBinding(name));
putToolTip(name);
}
@@ -149,7 +150,7 @@
* @param name the name of the command that is the tooltip text.
* @param icon the SMALL_ICON for the action
*/
- public CmdSetMode(
+ public SetModeAction(
Class modeClass,
String arg,
Object value,
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=12524&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=12523&r2=12524
==============================================================================
--- 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 09:40:56-0700
@@ -39,7 +39,7 @@
import org.argouml.model.DeleteInstanceEvent;
import org.argouml.model.Model;
import org.argouml.ui.CmdCreateNode;
-import org.argouml.ui.CmdSetMode;
+import org.argouml.ui.SetModeAction;
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 CmdSetMode(
+ new SetModeAction(
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=12524&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=12523&r2=12524
==============================================================================
--- 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 09:40:56-0700
@@ -34,7 +34,7 @@
import org.argouml.i18n.Translator;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
-import org.argouml.ui.CmdSetMode;
+import org.argouml.ui.SetModeAction;
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 CmdSetMode(
+ new SetModeAction(
ModeCreatePolyEdge.class,
"edgeClass",
Model.getMetaTypes().getDependency(),
@@ -319,7 +319,7 @@
if (actionGeneralize == null) {
actionGeneralize =
new RadioAction(
- new CmdSetMode(
+ new SetModeAction(
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=12524&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=12523&r2=12524
==============================================================================
--- 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 09:40:56-0700
@@ -36,7 +36,7 @@
import org.argouml.model.Facade;
import org.argouml.model.Model;
import org.argouml.ui.CmdCreateNode;
-import org.argouml.ui.CmdSetMode;
+import org.argouml.ui.SetModeAction;
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 CmdSetMode(
+ new RadioAction(new SetModeAction(
ModeCreatePolyEdge.class,
"edgeClass",
Model.getMetaTypes().getAssociation(),
@@ -320,7 +320,7 @@
protected Action getActionMDependency() {
if (actionMDependency == null) {
actionMDependency =
- new RadioAction(new CmdSetMode(
+ new RadioAction(new SetModeAction(
ModeCreatePolyEdge.class,
"edgeClass",
Model.getMetaTypes().getDependency(),
@@ -335,7 +335,7 @@
protected Action getActionMGeneralization() {
if (actionMGeneralization == null) {
actionMGeneralization =
- new RadioAction(new CmdSetMode(
+ new RadioAction(new SetModeAction(
ModeCreatePolyEdge.class,
"edgeClass",
Model.getMetaTypes().getGeneralization(),
@@ -350,7 +350,7 @@
protected Action getActionMAbstraction() {
if (actionMAbstraction == null) {
actionMAbstraction =
- new RadioAction(new CmdSetMode(
+ new RadioAction(new SetModeAction(
ModeCreatePolyEdge.class,
"edgeClass",
Model.getMetaTypes().getAbstraction(),
@@ -379,7 +379,7 @@
protected Action getActionMLink() {
if (actionMLink == null) {
actionMLink =
- new RadioAction(new CmdSetMode(
+ new RadioAction(new SetModeAction(
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=12524&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=12523&r2=12524
==============================================================================
--- 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 09:40:56-0700
@@ -31,7 +31,7 @@
import org.argouml.i18n.Translator;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
-import org.argouml.ui.CmdSetMode;
+import org.argouml.ui.SetModeAction;
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 CmdSetMode(
+ new RadioAction(new SetModeAction(
ModeCreateMessage.class, args,
(String) actionList[i][1]));
}
Hashtable args = new Hashtable();
args.put("name", SEQUENCE_EXPAND_BUTTON);
actions[5] =
- new RadioAction(new CmdSetMode(ModeChangeHeight.class,
+ new RadioAction(new SetModeAction(ModeChangeHeight.class,
args,
SEQUENCE_EXPAND_BUTTON));
args = new Hashtable();
args.put("name", SEQUENCE_CONTRACT_BUTTON);
actions[6] =
- new RadioAction(new CmdSetMode(ModeChangeHeight.class,
+ new RadioAction(new SetModeAction(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=12524&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=12523&r2=12524
==============================================================================
--- 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 09:40:56-0700
@@ -35,7 +35,7 @@
import org.argouml.model.DeleteInstanceEvent;
import org.argouml.model.Model;
import org.argouml.ui.CmdCreateNode;
-import org.argouml.ui.CmdSetMode;
+import org.argouml.ui.SetModeAction;
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 CmdSetMode(
+ new SetModeAction(
ModeCreatePolyEdge.class,
"edgeClass",
Model.getMetaTypes().getTransition(),
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=12524&p1=trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java&r1=12523&r2=12524
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java 2007-05-04 09:40:56-0700
@@ -42,7 +42,7 @@
import org.argouml.model.ModelManagementHelper;
import org.argouml.ui.ArgoDiagram;
import org.argouml.ui.CmdCreateNode;
-import org.argouml.ui.CmdSetMode;
+import org.argouml.ui.SetModeAction;
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 CmdSetMode(ModeSelect.class, "button.select");
+ new SetModeAction(ModeSelect.class, "button.select");
private static Action actionBroom =
- new CmdSetMode(ModeBroom.class, "button.broom");
+ new SetModeAction(ModeBroom.class, "button.broom");
private static Action actionRectangle =
- new RadioAction(new CmdSetMode(ModeCreateFigRect.class, "Rectangle",
+ new RadioAction(new SetModeAction(ModeCreateFigRect.class, "Rectangle",
"misc.primitive.rectangle"));
private static Action actionRRectangle =
- new RadioAction(new CmdSetMode(ModeCreateFigRRect.class, "RRect",
+ new RadioAction(new SetModeAction(ModeCreateFigRRect.class, "RRect",
"misc.primitive.rounded-rectangle"));
private static Action actionCircle =
- new RadioAction(new CmdSetMode(ModeCreateFigCircle.class, "Circle",
+ new RadioAction(new SetModeAction(ModeCreateFigCircle.class, "Circle",
"misc.primitive.circle"));
private static Action actionLine =
- new RadioAction(new CmdSetMode(ModeCreateFigLine.class, "Line",
+ new RadioAction(new SetModeAction(ModeCreateFigLine.class, "Line",
"misc.primitive.line"));
private static Action actionText =
- new RadioAction(new CmdSetMode(ModeCreateFigText.class, "Text",
+ new RadioAction(new SetModeAction(ModeCreateFigText.class, "Text",
"misc.primitive.text"));
private static Action actionPoly =
- new RadioAction(new CmdSetMode(ModeCreateFigPoly.class, "Polygon",
+ new RadioAction(new SetModeAction(ModeCreateFigPoly.class, "Polygon",
"misc.primitive.polygon"));
private static Action actionSpline =
- new RadioAction(new CmdSetMode(ModeCreateFigSpline.class, "Spline",
+ new RadioAction(new SetModeAction(ModeCreateFigSpline.class, "Spline",
"misc.primitive.spline"));
private static Action actionInk =
- new RadioAction(new CmdSetMode(ModeCreateFigInk.class, "Ink",
+ new RadioAction(new SetModeAction(ModeCreateFigInk.class, "Ink",
"misc.primitive.ink"));
////////////////////////////////////////////////////////////////
@@ -531,7 +531,7 @@
*/
protected Action makeCreateEdgeAction(Object modelElement, String descr) {
return new RadioAction(
- new CmdSetMode(ModeCreatePolyEdge.class, "edgeClass",
+ new SetModeAction(ModeCreatePolyEdge.class, "edgeClass",
modelElement, descr));
}
@@ -549,7 +549,7 @@
Object metaType,
String descr) {
return new RadioAction(
- new CmdSetMode(modeClass, "edgeClass", metaType, descr));
+ new SetModeAction(modeClass, "edgeClass", metaType, descr));
}
/**
@@ -559,7 +559,7 @@
*/
protected Action makeCreateGeneralizationAction() {
return new RadioAction(
- new CmdSetMode(
+ new SetModeAction(
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=12524&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=12523&r2=12524
==============================================================================
--- 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 09:40:56-0700
@@ -33,7 +33,7 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.ui.CmdCreateNode;
-import org.argouml.ui.CmdSetMode;
+import org.argouml.ui.SetModeAction;
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 CmdSetMode(
+ new SetModeAction(
ModeCreatePolyEdge.class,
"edgeClass",
Model.getMetaTypes().getDependency(),
@@ -341,7 +341,7 @@
protected Action getActionExtend() {
if (actionExtend == null) {
actionExtend = new RadioAction(
- new CmdSetMode(
+ new SetModeAction(
ModeCreatePolyEdge.class,
"edgeClass",
Model.getMetaTypes().getExtend(),
@@ -355,7 +355,7 @@
protected Action getActionGeneralize() {
if (actionGeneralize == null) {
actionGeneralize = new RadioAction(
- new CmdSetMode(
+ new SetModeAction(
ModeCreatePolyEdge.class,
"edgeClass",
Model.getMetaTypes().getGeneralization(),
@@ -369,7 +369,7 @@
protected Action getActionInclude() {
if (actionInclude == null) {
actionInclude = new RadioAction(
- new CmdSetMode(
+ new SetModeAction(
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.