383720: [StateMachine] Incorrect implementation of StateBehaviorsListener

https://bugs.eclipse.org/bugs/show_bug.cgi?id=383720

1 files changed, 23 insertions, 20 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/listeners/StateBehaviorsListener.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/listeners/StateBehaviorsListener.java
index 9ba1051abf8..05d021a820b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/listeners/StateBehaviorsListener.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/listeners/StateBehaviorsListener.java
@@ -73,27 +73,30 @@ public class StateBehaviorsListener extends AbstractModifcationTriggerListener {
 

 			Object oldObject = notif.getOldValue();

 			StateEditPart stateEditPart = getContainingEditPart(notif.getNotifier());

-			if(object instanceof Behavior) {

-				//Get the request to create the editPart

-				createRequest = getCreateRequest(object, stateEditPart);

-			}

-			//Get the request to delete the editPart

-			deleteRequest = getDeleteRequest(oldObject, stateEditPart);

-			//handle both request if needed

-			CompositeCommand cc = new CompositeCommand("Modification command triggered by modedication of one of the behaviros of selected state");//$NON-NLS-0$

-			org.eclipse.gef.commands.Command cmd1 = getCommandFromRequest(createRequest, stateEditPart);

-			if(cmd1 != null && cmd1.canExecute()) {

-				cc.compose(new CommandProxy(cmd1));

-			}

-			org.eclipse.gef.commands.Command cmd2 = getCommandFromRequest(deleteRequest, stateEditPart);

-			if(cmd2 != null && cmd2.canExecute()) {

-				cc.compose(new CommandProxy(cmd2));

-			}

 

-			refreshEditParts(cc, Collections.singleton((IGraphicalEditPart)stateEditPart));

-

-

-			return cc;

+			if (stateEditPart!=null){

+				if(object instanceof Behavior) {

+					//Get the request to create the editPart

+					createRequest = getCreateRequest(object, stateEditPart);

+				}

+				//Get the request to delete the editPart

+				deleteRequest = getDeleteRequest(oldObject, stateEditPart);

+				//handle both request if needed

+				CompositeCommand cc = new CompositeCommand("Modification command triggered by modedication of one of the behaviros of selected state");//$NON-NLS-0$

+				org.eclipse.gef.commands.Command cmd1 = getCommandFromRequest(createRequest, stateEditPart);

+				if(cmd1 != null && cmd1.canExecute()) {

+					cc.compose(new CommandProxy(cmd1));

+				}

+				org.eclipse.gef.commands.Command cmd2 = getCommandFromRequest(deleteRequest, stateEditPart);

+				if(cmd2 != null && cmd2.canExecute()) {

+					cc.compose(new CommandProxy(cmd2));

+				}

+

+				refreshEditParts(cc, Collections.singleton((IGraphicalEditPart)stateEditPart));

+

+

+				return cc;

+			}

 		}

 		return null;

 	}