Author: bobtarling
Date: 2011-05-20 03:56:58-0700
New Revision: 19473
Modified:
trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java
Log:
Remove any UML version conditions - this class is now UML1.4 only
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java?view=diff&pathrev=19473&r1=19472&r2=19473
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java 2011-05-20 03:56:58-0700
@@ -403,17 +403,11 @@
ArrayList actions = new ArrayList();
actions.add(getActionState());
- if (Model.getFacade().getUmlVersion().charAt(0) == '1') {
- actions.add(getActionCompositeState());
- }
+ actions.add(getActionCompositeState());
actions.add(getActionTransition());
-
- if (Model.getFacade().getUmlVersion().charAt(0) == '1') {
- actions.add(getActionSynchState());
- actions.add(getActionSubmachineState());
- actions.add(getActionStubState());
- }
-
+ actions.add(getActionSynchState());
+ actions.add(getActionSubmachineState());
+ actions.add(getActionStubState());
actions.add(null);
actions.add(getActionStartPseudoState());
actions.add(getActionFinalPseudoState());
@@ -481,19 +475,10 @@
*/
protected Action getActionCompositeState() {
if (actionCompositeState == null) {
- if (Model.getFacade().getUmlVersion().startsWith("1")) {
- actionCompositeState =
- new RadioAction(new CmdCreateNode(
- Model.getMetaTypes().getCompositeState(),
- "button.new-compositestate"));
- } else {
- // TODO: We need a specialist action here to set the composite flag]
- // on the state after its created.
- actionCompositeState =
- new RadioAction(new CmdCreateNode(
- Model.getMetaTypes().getState(),
- "button.new-compositestate"));
- }
+ actionCompositeState =
+ new RadioAction(new CmdCreateNode(
+ Model.getMetaTypes().getCompositeState(),
+ "button.new-compositestate"));
}
return actionCompositeState;
}
@@ -585,17 +570,10 @@
*/
protected Action getActionState() {
if (actionState == null) {
- if (Model.getFacade().getUmlVersion().charAt(0) == '1') {
- actionState =
- new RadioAction(
- new CmdCreateNode(Model.getMetaTypes().getSimpleState(),
- "button.new-simplestate"));
- } else {
- actionState =
- new RadioAction(
- new CmdCreateNode(Model.getMetaTypes().getState(),
- "button.new-simplestate"));
- }
+ actionState =
+ new RadioAction(
+ new CmdCreateNode(Model.getMetaTypes().getSimpleState(),
+ "button.new-simplestate"));
}
return actionState;
}
@@ -841,19 +819,11 @@
} else if (Model.getFacade().isASubmachineState(droppedObject)) {
figNode = new FigSubmachineState(droppedObject, bounds, settings);
} else if (Model.getFacade().isACompositeState(droppedObject)) {
- if (Model.getFacade().getUmlVersion().startsWith("1")) {
- figNode = new FigCompositeState(droppedObject, bounds, settings);
- } else {
- figNode = new FigVertex(droppedObject, bounds, settings);
- }
+ figNode = new FigCompositeState(droppedObject, bounds, settings);
} else if (Model.getFacade().isASynchState(droppedObject)) {
figNode = new FigSynchState(droppedObject, bounds, settings);
} else if (Model.getFacade().isAState(droppedObject)) {
- if (Model.getFacade().getUmlVersion().startsWith("1")) {
- figNode = new FigSimpleState(droppedObject, bounds, settings);
- } else {
- figNode = new FigVertex(droppedObject, bounds, settings);
- }
+ figNode = new FigSimpleState(droppedObject, bounds, settings);
} else if (Model.getFacade().isAComment(droppedObject)) {
figNode = new FigComment(droppedObject, bounds, settings);
} else if (Model.getFacade().isAPseudostate(droppedObject)) {
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2742262
To unsubscribe from this discussion, e-mail: [[email protected]].
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.