Author: bobtarling
Date: 2011-05-07 06:05:11-0700
New Revision: 19370
Modified:
trunk/src/argouml-app/src/org/argouml/uml/diagram/state/StateDiagramGraphModel.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigFinalState.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigInitialState.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigStateVertex.java
Log:
Avoid calls that work in UML1.4 only
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/StateDiagramGraphModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/StateDiagramGraphModel.java?view=diff&pathrev=19370&r1=19369&r2=19370
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/StateDiagramGraphModel.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/StateDiagramGraphModel.java 2011-05-07 06:05:11-0700
@@ -243,8 +243,10 @@
getNodes().add(node);
- if (Model.getFacade().isAStateVertex(node)) {
- Object top = Model.getStateMachinesHelper().getTop(getMachine());
+ if (Model.getFacade().getUmlVersion().startsWith("1")
+ && Model.getFacade().isAStateVertex(node)) {
+ final Object stateMachine = getMachine();
+ Object top = Model.getStateMachinesHelper().getTop(stateMachine);
Model.getStateMachinesHelper().addSubvertex(top, node);
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigFinalState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigFinalState.java?view=diff&pathrev=19370&r1=19369&r2=19370
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigFinalState.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigFinalState.java 2011-05-07 06:05:11-0700
@@ -148,7 +148,8 @@
Object pstate = getOwner();
Selection sel = null;
if ( pstate != null) {
- if (Model.getFacade().isAActivityGraph(
+ if (Model.getFacade().getUmlVersion().startsWith("1")
+ && Model.getFacade().isAActivityGraph(
Model.getFacade().getStateMachine(
Model.getFacade().getContainer(pstate)))) {
sel = new SelectionActionState(this);
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigInitialState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigInitialState.java?view=diff&pathrev=19370&r1=19369&r2=19370
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigInitialState.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigInitialState.java 2011-05-07 06:05:11-0700
@@ -116,9 +116,10 @@
Object pstate = getOwner();
Selection sel = null;
if ( pstate != null) {
- if (Model.getFacade().isAActivityGraph(
- Model.getFacade().getStateMachine(
- Model.getFacade().getContainer(pstate)))) {
+ if (Model.getFacade().getUmlVersion().startsWith("1")
+ && Model.getFacade().isAActivityGraph(
+ Model.getFacade().getStateMachine(
+ Model.getFacade().getContainer(pstate)))) {
sel = new SelectionActionState(this);
((SelectionActionState) sel).setIncomingButtonEnabled(false);
Collection outs = Model.getFacade().getOutgoings(getOwner());
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigStateVertex.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigStateVertex.java?view=diff&pathrev=19370&r1=19369&r2=19370
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigStateVertex.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigStateVertex.java 2011-05-07 06:05:11-0700
@@ -101,9 +101,11 @@
compositeState = encloser.getOwner();
((FigStateVertex) encloser).redrawEnclosedFigs();
} else {
- compositeState = Model.getStateMachinesHelper().getTop(
- Model.getStateMachinesHelper()
- .getStateMachine(stateVertex));
+ if (Model.getFacade().getUmlVersion().startsWith("1")) {
+ compositeState = Model.getStateMachinesHelper().getTop(
+ Model.getStateMachinesHelper()
+ .getStateMachine(stateVertex));
+ }
}
if (compositeState != null) {
/* Do not change the model unless needed - avoids issue 4446: */
@@ -150,7 +152,8 @@
if (pstate != null) {
- if (Model.getFacade().isAActivityGraph(
+ if (Model.getFacade().getUmlVersion().startsWith("1")
+ && Model.getFacade().isAActivityGraph(
Model.getFacade().getStateMachine(
Model.getFacade().getContainer(pstate)))) {
return new SelectionActionState(this);
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2732348
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.