UNCONFIRMED - bug 375508: [ActivityDiagram] Creation of a ReadStructuralFeatureAction in an activit group is impossible

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

It's now possible to create in a structured activity node:
 - AddStructuralFeatureValue
 - CentralBufferNode
 - CreateObjectAction
 - DestroyObjectAction
 - ReadSelfAction
 - ReadStructuralFeatureAction
 - ReadVariableAction

15 files changed, 102 insertions, 32 deletions

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.activity/plugin.xml b/plugins/uml/org.eclipse.papyrus.diagram.activity/plugin.xml
index 629d0aa6b8f..8bc799f1028 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.activity/plugin.xml
+++ b/plugins/uml/org.eclipse.papyrus.diagram.activity/plugin.xml
@@ -2508,6 +2508,7 @@ self.structuralFeature.oclAsType(Property).opposite.type = self.object.type]]>
             <target class="uml.Signal"/>

             <target class="uml.SendObjectAction"/>

             <target class="uml.BroadcastSignalAction"/>

+            <target class="uml.StructuredActivityNode"/>

          </constraint>

                   </constraints>

       </constraintProvider>

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/commands/AddStructuralFeatureValueActionCreateCommand.java b/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/commands/AddStructuralFeatureValueActionCreateCommand.java
index 8dbace40102..b447c9a74f5 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/commands/AddStructuralFeatureValueActionCreateCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/commands/AddStructuralFeatureValueActionCreateCommand.java
@@ -25,8 +25,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.diagram.activity.edit.commands.util.CreateCommandUtil;

 import org.eclipse.papyrus.diagram.activity.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Activity;

 import org.eclipse.uml2.uml.AddStructuralFeatureValueAction;

 import org.eclipse.uml2.uml.UMLFactory;

 

@@ -92,12 +92,18 @@ public class AddStructuralFeatureValueActionCreateCommand extends EditElementCom
 	}

 

 	/**

-	 * @generated

+	 * @generated NOT

+	 * Set correct parent for structured activity node

+	 * TODO Change generation

 	 */

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

 		AddStructuralFeatureValueAction newElement = UMLFactory.eINSTANCE.createAddStructuralFeatureValueAction();

-		Activity owner = (Activity)getElementToEdit();

-		owner.getNodes().add(newElement);

+		// set appropriate parents

+		if(!CreateCommandUtil.setNodeParents(newElement, getRequest(), getElementToEdit())) {

+			return CommandResult.newCancelledCommandResult();

+		}

+		// Activity owner = (Activity)getElementToEdit();

+		// owner.getNodes().add(newElement);

 		ElementInitializers.getInstance().init_AddStructuralFeatureValueAction_3091(newElement);

 		doConfigure(newElement, monitor, info);

 		((CreateElementRequest)getRequest()).setNewElement(newElement);

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/commands/AddVariableValueActionCreateCommand.java b/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/commands/AddVariableValueActionCreateCommand.java
index d787166b1d7..1321d7da316 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/commands/AddVariableValueActionCreateCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/commands/AddVariableValueActionCreateCommand.java
@@ -25,8 +25,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.diagram.activity.edit.commands.util.CreateCommandUtil;

 import org.eclipse.papyrus.diagram.activity.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Activity;

 import org.eclipse.uml2.uml.AddVariableValueAction;

 import org.eclipse.uml2.uml.UMLFactory;

 

@@ -92,12 +92,18 @@ public class AddVariableValueActionCreateCommand extends EditElementCommand {
 	}

 

 	/**

-	 * @generated

+	 * @generated NOT

+	 * Set correct parent

+	 * TODO change generation

 	 */

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

 		AddVariableValueAction newElement = UMLFactory.eINSTANCE.createAddVariableValueAction();

-		Activity owner = (Activity)getElementToEdit();

-		owner.getNodes().add(newElement);

+		// set appropriate parents

+		if(!CreateCommandUtil.setNodeParents(newElement, getRequest(), getElementToEdit())) {

+			return CommandResult.newCancelledCommandResult();

+		}

+		// Activity owner = (Activity)getElementToEdit();

+		// owner.getNodes().add(newElement);

 		ElementInitializers.getInstance().init_AddVariableValueAction_3099(newElement);

 		doConfigure(newElement, monitor, info);

 		((CreateElementRequest)getRequest()).setNewElement(newElement);

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/commands/CentralBufferNodeCreateCommand.java b/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/commands/CentralBufferNodeCreateCommand.java
index af97772e455..ddeb956f216 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/commands/CentralBufferNodeCreateCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/commands/CentralBufferNodeCreateCommand.java
@@ -12,8 +12,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.diagram.activity.edit.commands.util.CreateCommandUtil;

 import org.eclipse.papyrus.diagram.activity.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Activity;

 import org.eclipse.uml2.uml.CentralBufferNode;

 import org.eclipse.uml2.uml.UMLFactory;

 

@@ -79,12 +79,18 @@ public class CentralBufferNodeCreateCommand extends EditElementCommand {
 	}

 

 	/**

-	 * @generated

+	 * @generated NOT

+	 * Set correct parent (for Strucutred Activity node case)

+	 * TODO Change generation

 	 */

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

 		CentralBufferNode newElement = UMLFactory.eINSTANCE.createCentralBufferNode();

-		Activity owner = (Activity)getElementToEdit();

-		owner.getNodes().add(newElement);

+		// set appropriate parents

+		if(!CreateCommandUtil.setNodeParents(newElement, getRequest(), getElementToEdit())) {

+			return CommandResult.newCancelledCommandResult();

+		}

+		// Activity owner = (Activity)getElementToEdit();

+		// owner.getNodes().add(newElement);

 		ElementInitializers.getInstance().init_CentralBufferNode_3104(newElement);

 		doConfigure(newElement, monitor, info);

 		((CreateElementRequest)getRequest()).setNewElement(newElement);

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/commands/CreateObjectActionCreateCommand.java b/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/commands/CreateObjectActionCreateCommand.java
index 0653e3fc4d9..378de977093 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/commands/CreateObjectActionCreateCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/commands/CreateObjectActionCreateCommand.java
@@ -12,8 +12,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.diagram.activity.edit.commands.util.CreateCommandUtil;

 import org.eclipse.papyrus.diagram.activity.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Activity;

 import org.eclipse.uml2.uml.CreateObjectAction;

 import org.eclipse.uml2.uml.UMLFactory;

 

@@ -79,12 +79,18 @@ public class CreateObjectActionCreateCommand extends EditElementCommand {
 	}

 

 	/**

-	 * @generated

+	 * @generated NOT

+	 * Set Correct parent

+	 * TODO Change generation

 	 */

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

 		CreateObjectAction newElement = UMLFactory.eINSTANCE.createCreateObjectAction();

-		Activity owner = (Activity)getElementToEdit();

-		owner.getNodes().add(newElement);

+		// set appropriate parents

+		if(!CreateCommandUtil.setNodeParents(newElement, getRequest(), getElementToEdit())) {

+			return CommandResult.newCancelledCommandResult();

+		}

+		// Activity owner = (Activity)getElementToEdit();

+		// owner.getNodes().add(newElement);

 		ElementInitializers.getInstance().init_CreateObjectAction_3086(newElement);

 		doConfigure(newElement, monitor, info);

 		((CreateElementRequest)getRequest()).setNewElement(newElement);

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/commands/DestroyObjectActionCreateCommand.java b/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/commands/DestroyObjectActionCreateCommand.java
index 51482801777..55ff1af1ecc 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/commands/DestroyObjectActionCreateCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/commands/DestroyObjectActionCreateCommand.java
@@ -25,8 +25,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.diagram.activity.edit.commands.util.CreateCommandUtil;

 import org.eclipse.papyrus.diagram.activity.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Activity;

 import org.eclipse.uml2.uml.DestroyObjectAction;

 import org.eclipse.uml2.uml.UMLFactory;

 

@@ -92,12 +92,18 @@ public class DestroyObjectActionCreateCommand extends EditElementCommand {
 	}

 

 	/**

-	 * @generated

+	 * @generated NOT

+	 * Set Correct parent

+	 * TODO Change generation

 	 */

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

 		DestroyObjectAction newElement = UMLFactory.eINSTANCE.createDestroyObjectAction();

-		Activity owner = (Activity)getElementToEdit();

-		owner.getNodes().add(newElement);

+		// set appropriate parents

+		if(!CreateCommandUtil.setNodeParents(newElement, getRequest(), getElementToEdit())) {

+			return CommandResult.newCancelledCommandResult();

+		}

+		// Activity owner = (Activity)getElementToEdit();

+		// owner.getNodes().add(newElement);

 		ElementInitializers.getInstance().init_DestroyObjectAction_3095(newElement);

 		doConfigure(newElement, monitor, info);

 		((CreateElementRequest)getRequest()).setNewElement(newElement);

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/commands/InitialNodeCreateCommand.java b/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/commands/InitialNodeCreateCommand.java
index 0c043278ba5..0f864b62d40 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/commands/InitialNodeCreateCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/commands/InitialNodeCreateCommand.java
@@ -94,6 +94,8 @@ public class InitialNodeCreateCommand extends EditElementCommand {
 

 	/**

 	 * @generated NOT set appropriate parents

+	 * Set correct parent

+	 * TODO Change generation

 	 */

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

 		InitialNode newElement = UMLFactory.eINSTANCE.createInitialNode();

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/commands/ReadSelfActionCreateCommand.java b/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/commands/ReadSelfActionCreateCommand.java
index 5a91536dbfb..dcc0656fd35 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/commands/ReadSelfActionCreateCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/commands/ReadSelfActionCreateCommand.java
@@ -12,8 +12,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.diagram.activity.edit.commands.util.CreateCommandUtil;

 import org.eclipse.papyrus.diagram.activity.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Activity;

 import org.eclipse.uml2.uml.ReadSelfAction;

 import org.eclipse.uml2.uml.UMLFactory;

 

@@ -79,12 +79,18 @@ public class ReadSelfActionCreateCommand extends EditElementCommand {
 	}

 

 	/**

-	 * @generated

+	 * @generated NOT

+	 * Set correct parent

+	 * TODO Change generation

 	 */

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

 		ReadSelfAction newElement = UMLFactory.eINSTANCE.createReadSelfAction();

-		Activity owner = (Activity)getElementToEdit();

-		owner.getNodes().add(newElement);

+		// set appropriate parents

+		if(!CreateCommandUtil.setNodeParents(newElement, getRequest(), getElementToEdit())) {

+			return CommandResult.newCancelledCommandResult();

+		}

+		// Activity owner = (Activity)getElementToEdit();

+		// owner.getNodes().add(newElement);

 		ElementInitializers.getInstance().init_ReadSelfAction_3081(newElement);

 		doConfigure(newElement, monitor, info);

 		((CreateElementRequest)getRequest()).setNewElement(newElement);

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/commands/ReadStructuralFeatureActionCreateCommand.java b/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/commands/ReadStructuralFeatureActionCreateCommand.java
index b6111836913..d82dd4c7c1c 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/commands/ReadStructuralFeatureActionCreateCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/commands/ReadStructuralFeatureActionCreateCommand.java
@@ -25,8 +25,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.diagram.activity.edit.commands.util.CreateCommandUtil;

 import org.eclipse.papyrus.diagram.activity.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Activity;

 import org.eclipse.uml2.uml.ReadStructuralFeatureAction;

 import org.eclipse.uml2.uml.UMLFactory;

 

@@ -92,12 +92,17 @@ public class ReadStructuralFeatureActionCreateCommand extends EditElementCommand
 	}

 

 	/**

-	 * @generated

+	 * @generated NOT

+	 * TODO Change generation

 	 */

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

 		ReadStructuralFeatureAction newElement = UMLFactory.eINSTANCE.createReadStructuralFeatureAction();

-		Activity owner = (Activity)getElementToEdit();

-		owner.getNodes().add(newElement);

+		// set appropriate parents

+		if(!CreateCommandUtil.setNodeParents(newElement, getRequest(), getElementToEdit())) {

+			return CommandResult.newCancelledCommandResult();

+		}

+		// Activity owner = (Activity)getElementToEdit();

+		// owner.getNodes().add(newElement);

 		ElementInitializers.getInstance().init_ReadStructuralFeatureAction_3088(newElement);

 		doConfigure(newElement, monitor, info);

 		((CreateElementRequest)getRequest()).setNewElement(newElement);

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/commands/ReadVariableActionCreateCommand.java b/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/commands/ReadVariableActionCreateCommand.java
index 457791aa09c..b87b6e3b1cf 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/commands/ReadVariableActionCreateCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/commands/ReadVariableActionCreateCommand.java
@@ -25,8 +25,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.diagram.activity.edit.commands.util.CreateCommandUtil;

 import org.eclipse.papyrus.diagram.activity.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Activity;

 import org.eclipse.uml2.uml.ReadVariableAction;

 import org.eclipse.uml2.uml.UMLFactory;

 

@@ -92,12 +92,18 @@ public class ReadVariableActionCreateCommand extends EditElementCommand {
 	}

 

 	/**

-	 * @generated

+	 * @generated NOT

+	 * Set correct parent

+	 * TODO change generation

 	 */

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

 		ReadVariableAction newElement = UMLFactory.eINSTANCE.createReadVariableAction();

-		Activity owner = (Activity)getElementToEdit();

-		owner.getNodes().add(newElement);

+		// set appropriate parents

+		if(!CreateCommandUtil.setNodeParents(newElement, getRequest(), getElementToEdit())) {

+			return CommandResult.newCancelledCommandResult();

+		}

+		// Activity owner = (Activity)getElementToEdit();

+		// owner.getNodes().add(newElement);

 		ElementInitializers.getInstance().init_ReadVariableAction_3097(newElement);

 		doConfigure(newElement, monitor, info);

 		((CreateElementRequest)getRequest()).setNewElement(newElement);

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/policies/ConditionalNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/policies/ConditionalNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java
index 24590b607c8..0280dec209b 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/policies/ConditionalNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/policies/ConditionalNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java
@@ -37,6 +37,7 @@ import org.eclipse.papyrus.diagram.activity.edit.commands.JoinNodeCreateCommand;
 import org.eclipse.papyrus.diagram.activity.edit.commands.LoopNodeCreateCommand;

 import org.eclipse.papyrus.diagram.activity.edit.commands.MergeNodeCreateCommand;

 import org.eclipse.papyrus.diagram.activity.edit.commands.OpaqueActionCreateCommand;

+import org.eclipse.papyrus.diagram.activity.edit.commands.ReadSelfActionCreateCommand;

 import org.eclipse.papyrus.diagram.activity.edit.commands.ReadStructuralFeatureActionCreateCommand;

 import org.eclipse.papyrus.diagram.activity.edit.commands.ReadVariableActionCreateCommand;

 import org.eclipse.papyrus.diagram.activity.edit.commands.SendObjectActionCreateCommand;

@@ -191,6 +192,9 @@ public class ConditionalNodeStructuredActivityNodeContentCompartmentItemSemantic
 		if(UMLElementTypes.Comment_3080 == req.getElementType()) {

 			return getGEFWrapper(new CommentCreateCommand(req));

 		}

+		if(UMLElementTypes.ReadSelfAction_3081 == req.getElementType()) {

+			return getGEFWrapper(new ReadSelfActionCreateCommand(req));

+		}

 		return super.getCreateCommand(req);

 	}

 }

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/policies/ExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/policies/ExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java
index dc79d0a1d82..8e8e9e652d3 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/policies/ExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/policies/ExpansionRegionStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java
@@ -37,6 +37,7 @@ import org.eclipse.papyrus.diagram.activity.edit.commands.JoinNodeCreateCommand;
 import org.eclipse.papyrus.diagram.activity.edit.commands.LoopNodeCreateCommand;

 import org.eclipse.papyrus.diagram.activity.edit.commands.MergeNodeCreateCommand;

 import org.eclipse.papyrus.diagram.activity.edit.commands.OpaqueActionCreateCommand;

+import org.eclipse.papyrus.diagram.activity.edit.commands.ReadSelfActionCreateCommand;

 import org.eclipse.papyrus.diagram.activity.edit.commands.ReadStructuralFeatureActionCreateCommand;

 import org.eclipse.papyrus.diagram.activity.edit.commands.ReadVariableActionCreateCommand;

 import org.eclipse.papyrus.diagram.activity.edit.commands.SendObjectActionCreateCommand;

@@ -191,6 +192,9 @@ public class ExpansionRegionStructuredActivityNodeContentCompartmentItemSemantic
 		if(UMLElementTypes.Comment_3080 == req.getElementType()) {

 			return getGEFWrapper(new CommentCreateCommand(req));

 		}

+		if(UMLElementTypes.ReadSelfAction_3081 == req.getElementType()) {

+			return getGEFWrapper(new ReadSelfActionCreateCommand(req));

+		}

 		return super.getCreateCommand(req);

 	}

 }

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/policies/LoopNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/policies/LoopNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java
index f34bb28a832..3986ff3926f 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/policies/LoopNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/policies/LoopNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java
@@ -37,6 +37,7 @@ import org.eclipse.papyrus.diagram.activity.edit.commands.JoinNodeCreateCommand;
 import org.eclipse.papyrus.diagram.activity.edit.commands.LoopNodeCreateCommand;

 import org.eclipse.papyrus.diagram.activity.edit.commands.MergeNodeCreateCommand;

 import org.eclipse.papyrus.diagram.activity.edit.commands.OpaqueActionCreateCommand;

+import org.eclipse.papyrus.diagram.activity.edit.commands.ReadSelfActionCreateCommand;

 import org.eclipse.papyrus.diagram.activity.edit.commands.ReadStructuralFeatureActionCreateCommand;

 import org.eclipse.papyrus.diagram.activity.edit.commands.ReadVariableActionCreateCommand;

 import org.eclipse.papyrus.diagram.activity.edit.commands.SendObjectActionCreateCommand;

@@ -191,6 +192,9 @@ public class LoopNodeStructuredActivityNodeContentCompartmentItemSemanticEditPol
 		if(UMLElementTypes.Comment_3080 == req.getElementType()) {

 			return getGEFWrapper(new CommentCreateCommand(req));

 		}

+		if(UMLElementTypes.ReadSelfAction_3081 == req.getElementType()) {

+			return getGEFWrapper(new ReadSelfActionCreateCommand(req));

+		}

 		return super.getCreateCommand(req);

 	}

 }

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/policies/SequenceNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/policies/SequenceNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java
index cb019031ec8..7a8749ecc5a 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/policies/SequenceNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/policies/SequenceNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java
@@ -37,6 +37,7 @@ import org.eclipse.papyrus.diagram.activity.edit.commands.JoinNodeCreateCommand;
 import org.eclipse.papyrus.diagram.activity.edit.commands.LoopNodeCreateCommand;

 import org.eclipse.papyrus.diagram.activity.edit.commands.MergeNodeCreateCommand;

 import org.eclipse.papyrus.diagram.activity.edit.commands.OpaqueActionCreateCommand;

+import org.eclipse.papyrus.diagram.activity.edit.commands.ReadSelfActionCreateCommand;

 import org.eclipse.papyrus.diagram.activity.edit.commands.ReadStructuralFeatureActionCreateCommand;

 import org.eclipse.papyrus.diagram.activity.edit.commands.ReadVariableActionCreateCommand;

 import org.eclipse.papyrus.diagram.activity.edit.commands.SendObjectActionCreateCommand;

@@ -191,6 +192,9 @@ public class SequenceNodeStructuredActivityNodeContentCompartmentItemSemanticEdi
 		if(UMLElementTypes.Comment_3080 == req.getElementType()) {

 			return getGEFWrapper(new CommentCreateCommand(req));

 		}

+		if(UMLElementTypes.ReadSelfAction_3081 == req.getElementType()) {

+			return getGEFWrapper(new ReadSelfActionCreateCommand(req));

+		}

 		return super.getCreateCommand(req);

 	}

 }

diff --git a/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/policies/StructuredActivityNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java b/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/policies/StructuredActivityNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java
index 051b39162cb..b30a9ec7b2b 100644
--- a/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/policies/StructuredActivityNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/org.eclipse.papyrus.diagram.activity/src/org/eclipse/papyrus/diagram/activity/edit/policies/StructuredActivityNodeStructuredActivityNodeContentCompartmentItemSemanticEditPolicy.java
@@ -37,6 +37,7 @@ import org.eclipse.papyrus.diagram.activity.edit.commands.JoinNodeCreateCommand;
 import org.eclipse.papyrus.diagram.activity.edit.commands.LoopNodeCreateCommand;

 import org.eclipse.papyrus.diagram.activity.edit.commands.MergeNodeCreateCommand;

 import org.eclipse.papyrus.diagram.activity.edit.commands.OpaqueActionCreateCommand;

+import org.eclipse.papyrus.diagram.activity.edit.commands.ReadSelfActionCreateCommand;

 import org.eclipse.papyrus.diagram.activity.edit.commands.ReadStructuralFeatureActionCreateCommand;

 import org.eclipse.papyrus.diagram.activity.edit.commands.ReadVariableActionCreateCommand;

 import org.eclipse.papyrus.diagram.activity.edit.commands.SendObjectActionCreateCommand;

@@ -191,6 +192,9 @@ public class StructuredActivityNodeStructuredActivityNodeContentCompartmentItemS
 		if(UMLElementTypes.Comment_3080 == req.getElementType()) {

 			return getGEFWrapper(new CommentCreateCommand(req));

 		}

+		if(UMLElementTypes.ReadSelfAction_3081 == req.getElementType()) {

+			return getGEFWrapper(new ReadSelfActionCreateCommand(req));

+		}

 		return super.getCreateCommand(req);

 	}

 }