From ce44e3ba2d983ea0f071ca5e83bb79cc07b6af7c Mon Sep 17 00:00:00 2001 From: Remi Schnekenburger Date: Thu, 21 Sep 2017 16:15:05 +0200 Subject: Bug 522583 - [StateMachineDiagram] CreationCommand retains last state machine and state created - "forget" the previous state/statemachine attributes when initializing model. It could be possible to unset after the initializeDiagram has been performed, but this may have deeper side effects if these attributes are reused by overriding commands. Change-Id: I8cc9a2a117274c6a3019ea86cd2429ae75b89f28 Signed-off-by: Remi Schnekenburger --- .../uml/diagram/statemachine/CreateStateMachineDiagramCommand.java | 3 +++ 1 file changed, 3 insertions(+) (limited to 'plugins') diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/CreateStateMachineDiagramCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/CreateStateMachineDiagramCommand.java index e12ed53f3cb..414c23c5bdb 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/CreateStateMachineDiagramCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/CreateStateMachineDiagramCommand.java @@ -234,10 +234,13 @@ public class CreateStateMachineDiagramCommand extends CreateBehavioredClassifier protected void initializeModel(EObject owner) { if (owner instanceof StateMachine) { stateMachine = (StateMachine) owner; + state = null; } else if (owner instanceof State) { state = (State) owner; + stateMachine = null; } else { stateMachine = UMLFactory.eINSTANCE.createStateMachine(); + state = null; if (owner instanceof BehavioredClassifier) { BehavioredClassifier behaviorClassifier = (BehavioredClassifier) owner; behaviorClassifier.getOwnedBehaviors().add(stateMachine); -- cgit v1.2.3