Merge branch 'master' of ssh://git.eclipse.org/gitroot/papyrus/org.eclipse.papyrus

32 files changed, 137 insertions, 135 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/CreateSequenceDiagramWithNavigationHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/CreateSequenceDiagramWithNavigationHandler.java
deleted file mode 100644
index 9ac52e8aa9f..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/CreateSequenceDiagramWithNavigationHandler.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 Atos Origin.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.sequence;

-

-import org.eclipse.papyrus.infra.gmfdiag.navigation.CreateDiagramWithNavigationHandler;

-

-public class CreateSequenceDiagramWithNavigationHandler extends CreateDiagramWithNavigationHandler {

-

-	public CreateSequenceDiagramWithNavigationHandler() {

-		super(new CreateSequenceDiagramCommand(), new SequenceDiagramCreationCondition());

-	}

-}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/SequenceDiagramCreationCondition.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/SequenceDiagramCreationCondition.java
index 5f701bcc345..eeb5331c50f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/SequenceDiagramCreationCondition.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/SequenceDiagramCreationCondition.java
@@ -12,7 +12,6 @@ package org.eclipse.papyrus.uml.diagram.sequence;
 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.papyrus.infra.core.extension.commands.PerspectiveContextDependence;

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

 

 /**

  * SequenceDiagramCreationCondition class allows to check if a Sequence diagram can be added to the

@@ -25,10 +24,6 @@ public class SequenceDiagramCreationCondition extends PerspectiveContextDependen
 	 */

 	@Override

 	public boolean create(EObject selectedElement) {

-		if(super.create(selectedElement)) {

-			// TODO : to specify according to the spec

-			return selectedElement instanceof Interaction;

-		}

 		return false;

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomActionExecutionSpecificationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomActionExecutionSpecificationCreateCommand.java
index b606523c5a9..0fa6f7c087a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomActionExecutionSpecificationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomActionExecutionSpecificationCreateCommand.java
@@ -19,6 +19,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

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

+import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ActionExecutionSpecificationCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.util.CommandHelper;

 import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;

@@ -37,8 +38,8 @@ public class CustomActionExecutionSpecificationCreateCommand extends ActionExecu
 	 * @param req

 	 * @param eObject

 	 */

-	public CustomActionExecutionSpecificationCreateCommand(CreateElementRequest req, EObject eObject) {

-		super(req, eObject);

+	public CustomActionExecutionSpecificationCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {

+		super(req, eObject, diagram);

 	}

 

 	/**

@@ -46,8 +47,8 @@ public class CustomActionExecutionSpecificationCreateCommand extends ActionExecu
 	 * 

 	 * @param req

 	 */

-	public CustomActionExecutionSpecificationCreateCommand(CreateElementRequest req) {

-		super(req);

+	public CustomActionExecutionSpecificationCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req, diagram);

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomBehaviorExecutionSpecificationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomBehaviorExecutionSpecificationCreateCommand.java
index 3524e205cbf..73095cc1c9f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomBehaviorExecutionSpecificationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomBehaviorExecutionSpecificationCreateCommand.java
@@ -19,6 +19,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

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

+import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.BehaviorExecutionSpecificationCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.util.CommandHelper;

 import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;

@@ -37,8 +38,8 @@ public class CustomBehaviorExecutionSpecificationCreateCommand extends BehaviorE
 	 * @param req

 	 * @param eObject

 	 */

-	public CustomBehaviorExecutionSpecificationCreateCommand(CreateElementRequest req, EObject eObject) {

-		super(req, eObject);

+	public CustomBehaviorExecutionSpecificationCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {

+		super(req, eObject, diagram);

 	}

 

 	/**

@@ -46,8 +47,8 @@ public class CustomBehaviorExecutionSpecificationCreateCommand extends BehaviorE
 	 * 

 	 * @param req

 	 */

-	public CustomBehaviorExecutionSpecificationCreateCommand(CreateElementRequest req) {

-		super(req);

+	public CustomBehaviorExecutionSpecificationCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req, diagram);

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomCombinedFragment2CreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomCombinedFragment2CreateCommand.java
index 31df7eff2fc..97b5e9d1e6f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomCombinedFragment2CreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomCombinedFragment2CreateCommand.java
@@ -19,6 +19,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

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

+import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CombinedFragment2CreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.util.CommandHelper;

 import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;

@@ -36,8 +37,8 @@ public class CustomCombinedFragment2CreateCommand extends CombinedFragment2Creat
 	 * @param req

 	 * @param eObject

 	 */

-	public CustomCombinedFragment2CreateCommand(CreateElementRequest req, EObject eObject) {

-		super(req, eObject);

+	public CustomCombinedFragment2CreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {

+		super(req, eObject, diagram);

 	}

 

 	/**

@@ -45,8 +46,8 @@ public class CustomCombinedFragment2CreateCommand extends CombinedFragment2Creat
 	 * 

 	 * @param req

 	 */

-	public CustomCombinedFragment2CreateCommand(CreateElementRequest req) {

-		super(req);

+	public CustomCombinedFragment2CreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req, diagram);

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomCombinedFragmentCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomCombinedFragmentCreateCommand.java
index 98c68a5360a..41320d8ee3f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomCombinedFragmentCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomCombinedFragmentCreateCommand.java
@@ -21,6 +21,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

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

+import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.CombinedFragmentCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

 import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;

@@ -41,8 +42,8 @@ public class CustomCombinedFragmentCreateCommand extends CombinedFragmentCreateC
 	 * @param req

 	 * @param eObject

 	 */

-	public CustomCombinedFragmentCreateCommand(CreateElementRequest req, EObject eObject) {

-		super(req, eObject);

+	public CustomCombinedFragmentCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {

+		super(req, eObject, diagram);

 	}

 

 	/**

@@ -50,8 +51,8 @@ public class CustomCombinedFragmentCreateCommand extends CombinedFragmentCreateC
 	 * 

 	 * @param req

 	 */

-	public CustomCombinedFragmentCreateCommand(CreateElementRequest req) {

-		super(req);

+	public CustomCombinedFragmentCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req, diagram);

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomConsiderIgnoreFragmentCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomConsiderIgnoreFragmentCreateCommand.java
index df07d86fcdc..c7cfa87305d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomConsiderIgnoreFragmentCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomConsiderIgnoreFragmentCreateCommand.java
@@ -21,6 +21,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

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

+import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConsiderIgnoreFragmentCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

 import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;

@@ -42,8 +43,8 @@ public class CustomConsiderIgnoreFragmentCreateCommand extends ConsiderIgnoreFra
 	 * @param req

 	 * @param eObject

 	 */

-	public CustomConsiderIgnoreFragmentCreateCommand(CreateElementRequest req, EObject eObject) {

-		super(req, eObject);

+	public CustomConsiderIgnoreFragmentCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {

+		super(req, eObject, diagram);

 	}

 

 	/**

@@ -51,8 +52,8 @@ public class CustomConsiderIgnoreFragmentCreateCommand extends ConsiderIgnoreFra
 	 * 

 	 * @param req

 	 */

-	public CustomConsiderIgnoreFragmentCreateCommand(CreateElementRequest req) {

-		super(req);

+	public CustomConsiderIgnoreFragmentCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req, diagram);

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomConstraintCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomConstraintCreateCommand.java
index 523990ac3db..89182ed481c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomConstraintCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomConstraintCreateCommand.java
@@ -15,6 +15,7 @@ package org.eclipse.papyrus.uml.diagram.sequence.command;
 

 import org.eclipse.emf.ecore.EObject;

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

+import org.eclipse.gmf.runtime.notation.Diagram;

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

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ConstraintCreateCommand;

 import org.eclipse.uml2.uml.Lifeline;

@@ -33,8 +34,8 @@ public class CustomConstraintCreateCommand extends ConstraintCreateCommand {
 	 * @param req

 	 * @param eObject

 	 */

-	public CustomConstraintCreateCommand(CreateElementRequest req, EObject eObject) {

-		super(req, eObject);

+	public CustomConstraintCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {

+		super(req, eObject, diagram);

 		this.eObject = eObject;

 	}

 

@@ -43,8 +44,8 @@ public class CustomConstraintCreateCommand extends ConstraintCreateCommand {
 	 * 

 	 * @param req

 	 */

-	public CustomConstraintCreateCommand(CreateElementRequest req) {

-		super(req);

+	public CustomConstraintCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req, diagram);

 	}

 

 	protected EObject getElementToEdit() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomContinuationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomContinuationCreateCommand.java
index 38d1181ce83..8c312db57e5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomContinuationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomContinuationCreateCommand.java
@@ -19,6 +19,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

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

+import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.ContinuationCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

 import org.eclipse.uml2.uml.CombinedFragment;

@@ -39,8 +40,8 @@ public class CustomContinuationCreateCommand extends ContinuationCreateCommand {
 	 * @param req

 	 * @param eObject

 	 */

-	public CustomContinuationCreateCommand(CreateElementRequest req, EObject eObject) {

-		super(req, eObject);

+	public CustomContinuationCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {

+		super(req, eObject, diagram);

 	}

 

 	/**

@@ -48,8 +49,8 @@ public class CustomContinuationCreateCommand extends ContinuationCreateCommand {
 	 * 

 	 * @param req

 	 */

-	public CustomContinuationCreateCommand(CreateElementRequest req) {

-		super(req);

+	public CustomContinuationCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req, diagram);

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomDestructionOccurrenceSpecificationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomDestructionOccurrenceSpecificationCreateCommand.java
index 19268067955..80de7c7c4d6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomDestructionOccurrenceSpecificationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomDestructionOccurrenceSpecificationCreateCommand.java
@@ -19,6 +19,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

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

+import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.DestructionOccurrenceSpecificationCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

 import org.eclipse.papyrus.uml.diagram.sequence.util.CommandHelper;

@@ -38,8 +39,8 @@ public class CustomDestructionOccurrenceSpecificationCreateCommand extends Destr
 	 * @param req

 	 * @param eObject

 	 */

-	public CustomDestructionOccurrenceSpecificationCreateCommand(CreateElementRequest req, EObject eObject) {

-		super(req, eObject);

+	public CustomDestructionOccurrenceSpecificationCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {

+		super(req, eObject, diagram);

 	}

 

 	/**

@@ -47,8 +48,8 @@ public class CustomDestructionOccurrenceSpecificationCreateCommand extends Destr
 	 * 

 	 * @param req

 	 */

-	public CustomDestructionOccurrenceSpecificationCreateCommand(CreateElementRequest req) {

-		super(req);

+	public CustomDestructionOccurrenceSpecificationCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req, diagram);

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomDurationConstraintCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomDurationConstraintCreateCommand.java
index 0c3622370e4..ad9124326a7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomDurationConstraintCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomDurationConstraintCreateCommand.java
@@ -21,6 +21,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

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

+import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.DurationConstraintCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

 import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;

@@ -42,8 +43,8 @@ public class CustomDurationConstraintCreateCommand extends DurationConstraintCre
 	 * @param req

 	 * @param eObject

 	 */

-	public CustomDurationConstraintCreateCommand(CreateElementRequest req, EObject eObject) {

-		super(req, eObject);

+	public CustomDurationConstraintCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {

+		super(req, eObject, diagram);

 	}

 

 	/**

@@ -51,8 +52,8 @@ public class CustomDurationConstraintCreateCommand extends DurationConstraintCre
 	 * 

 	 * @param req

 	 */

-	public CustomDurationConstraintCreateCommand(CreateElementRequest req) {

-		super(req);

+	public CustomDurationConstraintCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req, diagram);

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomDurationConstraintInMessageCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomDurationConstraintInMessageCreateCommand.java
index 988bc22ea0a..0c86a091340 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomDurationConstraintInMessageCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomDurationConstraintInMessageCreateCommand.java
@@ -15,6 +15,7 @@ package org.eclipse.papyrus.uml.diagram.sequence.command;
 

 import org.eclipse.emf.ecore.EObject;

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

+import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.DurationConstraintInMessageCreateCommand;

 

 /**

@@ -28,8 +29,8 @@ public class CustomDurationConstraintInMessageCreateCommand extends DurationCons
 	 * @param req

 	 * @param eObject

 	 */

-	public CustomDurationConstraintInMessageCreateCommand(CreateElementRequest req, EObject eObject) {

-		super(req, eObject);

+	public CustomDurationConstraintInMessageCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {

+		super(req, eObject, diagram);

 	}

 

 	/**

@@ -37,8 +38,8 @@ public class CustomDurationConstraintInMessageCreateCommand extends DurationCons
 	 * 

 	 * @param req

 	 */

-	public CustomDurationConstraintInMessageCreateCommand(CreateElementRequest req) {

-		super(req);

+	public CustomDurationConstraintInMessageCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req, diagram);

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomDurationObservationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomDurationObservationCreateCommand.java
index 5b553c993b4..335a4892e7d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomDurationObservationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomDurationObservationCreateCommand.java
@@ -21,6 +21,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

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

+import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.DurationObservationCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

 import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;

@@ -41,8 +42,8 @@ public class CustomDurationObservationCreateCommand extends DurationObservationC
 	 * @param req

 	 * @param eObject

 	 */

-	public CustomDurationObservationCreateCommand(CreateElementRequest req, EObject eObject) {

-		super(req, eObject);

+	public CustomDurationObservationCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {

+		super(req, eObject, diagram);

 	}

 

 	/**

@@ -50,8 +51,8 @@ public class CustomDurationObservationCreateCommand extends DurationObservationC
 	 * 

 	 * @param req

 	 */

-	public CustomDurationObservationCreateCommand(CreateElementRequest req) {

-		super(req);

+	public CustomDurationObservationCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req, diagram);

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomInteractionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomInteractionCreateCommand.java
index 31d3f97958c..5550e5c2e5c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomInteractionCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomInteractionCreateCommand.java
@@ -19,6 +19,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

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

+import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.InteractionCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

 import org.eclipse.uml2.uml.BehavioredClassifier;

@@ -37,8 +38,8 @@ public class CustomInteractionCreateCommand extends InteractionCreateCommand {
 	 * @param req

 	 * @param eObject

 	 */

-	public CustomInteractionCreateCommand(CreateElementRequest req, EObject eObject) {

-		super(req, eObject);

+	public CustomInteractionCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {

+		super(req, eObject, diagram);

 	}

 

 	/**

@@ -46,8 +47,8 @@ public class CustomInteractionCreateCommand extends InteractionCreateCommand {
 	 * 

 	 * @param req

 	 */

-	public CustomInteractionCreateCommand(CreateElementRequest req) {

-		super(req);

+	public CustomInteractionCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req, diagram);

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomInteractionOperandCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomInteractionOperandCreateCommand.java
index bcb1f899901..3e0a3f65f80 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomInteractionOperandCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomInteractionOperandCreateCommand.java
@@ -21,6 +21,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

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

+import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.InteractionOperandCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

 import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;

@@ -43,8 +44,8 @@ public class CustomInteractionOperandCreateCommand extends InteractionOperandCre
 	 * @param req

 	 * @param eObject

 	 */

-	public CustomInteractionOperandCreateCommand(CreateElementRequest req, EObject eObject) {

-		super(req, eObject);

+	public CustomInteractionOperandCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {

+		super(req, eObject, diagram);

 	}

 

 	/**

@@ -52,8 +53,8 @@ public class CustomInteractionOperandCreateCommand extends InteractionOperandCre
 	 * 

 	 * @param req

 	 */

-	public CustomInteractionOperandCreateCommand(CreateElementRequest req) {

-		super(req);

+	public CustomInteractionOperandCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req, diagram);

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomInteractionUseCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomInteractionUseCreateCommand.java
index dbec50e8f2e..dd326bf19aa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomInteractionUseCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomInteractionUseCreateCommand.java
@@ -19,6 +19,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

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

+import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.InteractionUseCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Interaction;

@@ -37,8 +38,8 @@ public class CustomInteractionUseCreateCommand extends InteractionUseCreateComma
 	 * @param req

 	 * @param eObject

 	 */

-	public CustomInteractionUseCreateCommand(CreateElementRequest req, EObject eObject) {

-		super(req, eObject);

+	public CustomInteractionUseCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {

+		super(req, eObject, diagram);

 	}

 

 	/**

@@ -46,8 +47,8 @@ public class CustomInteractionUseCreateCommand extends InteractionUseCreateComma
 	 * 

 	 * @param req

 	 */

-	public CustomInteractionUseCreateCommand(CreateElementRequest req) {

-		super(req);

+	public CustomInteractionUseCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req, diagram);

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomLifelineCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomLifelineCreateCommand.java
index a1ec0684923..741c0379f14 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomLifelineCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomLifelineCreateCommand.java
@@ -24,6 +24,7 @@ import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 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.Diagram;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.LifelineCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

 import org.eclipse.papyrus.uml.diagram.sequence.util.CommandHelper;

@@ -53,8 +54,8 @@ public class CustomLifelineCreateCommand extends LifelineCreateCommand {
 	 * @param req

 	 * @param eObject

 	 */

-	public CustomLifelineCreateCommand(CreateElementRequest req, EObject eObject) {

-		super(req, eObject);

+	public CustomLifelineCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {

+		super(req, eObject, diagram);

 	}

 

 	/**

@@ -62,8 +63,8 @@ public class CustomLifelineCreateCommand extends LifelineCreateCommand {
 	 * 

 	 * @param req

 	 */

-	public CustomLifelineCreateCommand(CreateElementRequest req) {

-		super(req);

+	public CustomLifelineCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req, diagram);

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomStateInvariantCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomStateInvariantCreateCommand.java
index b5aed9e1e64..a8a1a438871 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomStateInvariantCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomStateInvariantCreateCommand.java
@@ -19,6 +19,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

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

+import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.StateInvariantCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.util.CommandHelper;

 import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;

@@ -36,8 +37,8 @@ public class CustomStateInvariantCreateCommand extends StateInvariantCreateComma
 	 * @param req

 	 * @param eObject

 	 */

-	public CustomStateInvariantCreateCommand(CreateElementRequest req, EObject eObject) {

-		super(req, eObject);

+	public CustomStateInvariantCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {

+		super(req, eObject, diagram);

 	}

 

 	/**

@@ -45,8 +46,8 @@ public class CustomStateInvariantCreateCommand extends StateInvariantCreateComma
 	 * 

 	 * @param req

 	 */

-	public CustomStateInvariantCreateCommand(CreateElementRequest req) {

-		super(req);

+	public CustomStateInvariantCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req, diagram);

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomTimeConstraintCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomTimeConstraintCreateCommand.java
index 241617aeaa4..491384be237 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomTimeConstraintCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CustomTimeConstraintCreateCommand.java
@@ -21,6 +21,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

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

+import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.commands.TimeConstraintCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.providers.ElementInitializers;

 import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceRequestConstant;

@@ -44,8 +45,8 @@ public class CustomTimeConstraintCreateCommand extends TimeConstraintCreateComma
 	 * @param req

 	 * @param eObject

 	 */

-	public CustomTimeConstraintCreateCommand(CreateElementRequest req, EObject eObject) {

-		super(req, eObject);

+	public CustomTimeConstraintCreateCommand(CreateElementRequest req, EObject eObject, Diagram diagram) {

+		super(req, eObject, diagram);

 	}

 

 	/**

@@ -53,8 +54,8 @@ public class CustomTimeConstraintCreateCommand extends TimeConstraintCreateComma
 	 * 

 	 * @param req

 	 */

-	public CustomTimeConstraintCreateCommand(CreateElementRequest req) {

-		super(req);

+	public CustomTimeConstraintCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req, diagram);

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomCombinedFragmentCombinedFragmentCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomCombinedFragmentCombinedFragmentCompartmentItemSemanticEditPolicy.java
index eff27a8d0ab..3a746d5d6ce 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomCombinedFragmentCombinedFragmentCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomCombinedFragmentCombinedFragmentCompartmentItemSemanticEditPolicy.java
@@ -19,6 +19,7 @@ import org.eclipse.gef.commands.Command;
 import org.eclipse.gef.commands.CompoundCommand;

 import org.eclipse.gef.commands.UnexecutableCommand;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomInteractionOperandCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CombinedFragmentCombinedFragmentCompartmentItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

@@ -52,7 +53,7 @@ public class CustomCombinedFragmentCombinedFragmentCompartmentItemSemanticEditPo
 			}

 			// make compound command

 			CompoundCommand result = new CompoundCommand();

-			Command cmd = getGEFWrapper(new CustomInteractionOperandCreateCommand(req));

+			Command cmd = getGEFWrapper(new CustomInteractionOperandCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 			result.add(cmd);

 			// append a command which notifies

 			// Fixed bug: remove the notify dialog, see: https://bugs.eclipse.org/bugs/show_bug.cgi?id=402977

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomInteractionInteractionCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomInteractionInteractionCompartmentItemSemanticEditPolicy.java
index a628bc7e83e..a8f4ecab65d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomInteractionInteractionCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomInteractionInteractionCompartmentItemSemanticEditPolicy.java
@@ -15,6 +15,7 @@ package org.eclipse.papyrus.uml.diagram.sequence.edit.policies.semantic;
 

 import org.eclipse.gef.commands.Command;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomCombinedFragmentCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomConsiderIgnoreFragmentCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomConstraintCreateCommand;

@@ -38,31 +39,31 @@ public class CustomInteractionInteractionCompartmentItemSemanticEditPolicy exten
 	@Override

 	protected Command getCreateCommand(CreateElementRequest req) {

 		if(UMLElementTypes.ConsiderIgnoreFragment_3007 == req.getElementType()) {

-			return getGEFWrapper(new CustomConsiderIgnoreFragmentCreateCommand(req));

+			return getGEFWrapper(new CustomConsiderIgnoreFragmentCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if(UMLElementTypes.CombinedFragment_3004 == req.getElementType()) {

-			return getGEFWrapper(new CustomCombinedFragmentCreateCommand(req));

+			return getGEFWrapper(new CustomCombinedFragmentCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if(UMLElementTypes.Lifeline_3001 == req.getElementType()) {

-			return getGEFWrapper(new CustomLifelineCreateCommand(req));

+			return getGEFWrapper(new CustomLifelineCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if(UMLElementTypes.InteractionUse_3002 == req.getElementType()) {

-			return getGEFWrapper(new CustomInteractionUseCreateCommand(req));

+			return getGEFWrapper(new CustomInteractionUseCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if(UMLElementTypes.Constraint_3008 == req.getElementType()) {

-			return getGEFWrapper(new CustomConstraintCreateCommand(req));

+			return getGEFWrapper(new CustomConstraintCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if(UMLElementTypes.Comment_3009 == req.getElementType()) {

-			return getGEFWrapper(new CommentCreateCommand(req));

+			return getGEFWrapper(new CommentCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if(UMLElementTypes.TimeObservation_3020 == req.getElementType()) {

 			return getGEFWrapper(new CustomTimeObservationCreateCommand(req));

 		}

 		if(UMLElementTypes.DurationObservation_3024 == req.getElementType()) {

-			return getGEFWrapper(new CustomDurationObservationCreateCommand(req));

+			return getGEFWrapper(new CustomDurationObservationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if(UMLElementTypes.DurationConstraint_3021 == req.getElementType()) {

-			return getGEFWrapper(new CustomDurationConstraintCreateCommand(req));

+			return getGEFWrapper(new CustomDurationConstraintCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		return super.getCreateCommand(req);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomInteractionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomInteractionItemSemanticEditPolicy.java
index adf80307fd2..ed33cec95e7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomInteractionItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomInteractionItemSemanticEditPolicy.java
@@ -23,6 +23,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

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

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

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomCommentAnnotatedElementReorientCommand;

@@ -68,10 +69,10 @@ public class CustomInteractionItemSemanticEditPolicy extends InteractionItemSema
 	@Override

 	protected Command getCreateCommand(CreateElementRequest req) {

 		if(UMLElementTypes.DurationConstraint_3023 == req.getElementType()) {

-			return getGEFWrapper(new CustomDurationConstraintInMessageCreateCommand(req));

+			return getGEFWrapper(new CustomDurationConstraintInMessageCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if(UMLElementTypes.DurationObservation_3024 == req.getElementType()) {

-			return getGEFWrapper(new CustomDurationObservationCreateCommand(req));

+			return getGEFWrapper(new CustomDurationObservationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		return super.getCreateCommand(req);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomInteractionOperandItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomInteractionOperandItemSemanticEditPolicy.java
index 39a1c4547c5..45f52fbda6c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomInteractionOperandItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomInteractionOperandItemSemanticEditPolicy.java
@@ -31,6 +31,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

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

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

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomCombinedFragmentCreateCommand;

@@ -80,16 +81,16 @@ public class CustomInteractionOperandItemSemanticEditPolicy extends InteractionO
 	@Override

 	protected Command getCreateCommand(CreateElementRequest req) {

 		if(UMLElementTypes.InteractionUse_3002 == req.getElementType()) {

-			return getGEFWrapper(new CustomInteractionUseCreateCommand(req));

+			return getGEFWrapper(new CustomInteractionUseCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if(UMLElementTypes.ConsiderIgnoreFragment_3007 == req.getElementType()) {

-			return getGEFWrapper(new CustomConsiderIgnoreFragmentCreateCommand(req));

+			return getGEFWrapper(new CustomConsiderIgnoreFragmentCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if(UMLElementTypes.CombinedFragment_3004 == req.getElementType()) {

-			return getGEFWrapper(new CustomCombinedFragmentCreateCommand(req));

+			return getGEFWrapper(new CustomCombinedFragmentCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if(UMLElementTypes.Continuation_3016 == req.getElementType()) {

-			return getGEFWrapper(new CustomContinuationCreateCommand(req));

+			return getGEFWrapper(new CustomContinuationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		return super.getCreateCommand(req);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomLifelineItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomLifelineItemSemanticEditPolicy.java
index 86f6ba5b09e..54c00bcf5d3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomLifelineItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomLifelineItemSemanticEditPolicy.java
@@ -29,6 +29,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

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

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

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomActionExecutionSpecificationCreateCommand;

@@ -93,42 +94,42 @@ public class CustomLifelineItemSemanticEditPolicy extends LifelineItemSemanticEd
 	@Override

 	protected Command getCreateCommand(CreateElementRequest req) {

 		if(UMLElementTypes.ActionExecutionSpecification_3006 == req.getElementType()) {

-			return getGEFWrapper(new CustomActionExecutionSpecificationCreateCommand(req));

+			return getGEFWrapper(new CustomActionExecutionSpecificationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if(UMLElementTypes.BehaviorExecutionSpecification_3003 == req.getElementType()) {

-			return getGEFWrapper(new CustomBehaviorExecutionSpecificationCreateCommand(req));

+			return getGEFWrapper(new CustomBehaviorExecutionSpecificationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if(UMLElementTypes.StateInvariant_3017 == req.getElementType()) {

-			return getGEFWrapper(new CustomStateInvariantCreateCommand(req));

+			return getGEFWrapper(new CustomStateInvariantCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if(UMLElementTypes.CombinedFragment_3018 == req.getElementType()) {

-			return getGEFWrapper(new CustomCombinedFragment2CreateCommand(req));

+			return getGEFWrapper(new CustomCombinedFragment2CreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if(UMLElementTypes.TimeConstraint_3019 == req.getElementType()) {

-			return getGEFWrapper(new CustomTimeConstraintCreateCommand(req));

+			return getGEFWrapper(new CustomTimeConstraintCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

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

 		//		if(UMLElementTypes.TimeObservation_3020 == req.getElementType()) {

 		//			return getGEFWrapper(new TimeObservationCreateCommand(req));

 		//		}

 		if(UMLElementTypes.DurationConstraint_3021 == req.getElementType()) {

-			return getGEFWrapper(new CustomDurationConstraintCreateCommand(req));

+			return getGEFWrapper(new CustomDurationConstraintCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if(UMLElementTypes.DestructionOccurrenceSpecification_3022 == req.getElementType()) {

-			return getGEFWrapper(new CustomDestructionOccurrenceSpecificationCreateCommand(req));

+			return getGEFWrapper(new CustomDestructionOccurrenceSpecificationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		//add lifelines

 		if(UMLElementTypes.Lifeline_3001 == req.getElementType()) {

 			CustomLifelineEditPart lifelineEditPart = (CustomLifelineEditPart)getHost();

 			if(lifelineEditPart.isInlineCapability()) {

-				CustomLifelineCreateCommand cmd = new CustomLifelineCreateCommand(req);

+				CustomLifelineCreateCommand cmd = new CustomLifelineCreateCommand(req, DiagramUtils.getDiagramFrom(getHost()));

 				cmd.setAvailableProperties(lifelineEditPart.getAvailableProperties());

 				return getGEFWrapper(cmd);

 			}

 		}

 		//add DurationObservation/Constraint

 		if(UMLElementTypes.DurationConstraint_3023 == req.getElementType()) {

-			return getGEFWrapper(new CustomDurationConstraintCreateCommand(req));

+			return getGEFWrapper(new CustomDurationConstraintCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

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

 		//		if(UMLElementTypes.DurationObservation_3024 == req.getElementType()) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomMessage2ItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomMessage2ItemSemanticEditPolicy.java
index d3a38ec96de..200487329aa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomMessage2ItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomMessage2ItemSemanticEditPolicy.java
@@ -23,6 +23,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

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

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

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomCommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomConstraintConstrainedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomDurationConstraintCreateCommand;

@@ -70,10 +71,10 @@ public class CustomMessage2ItemSemanticEditPolicy extends Message2ItemSemanticEd
 	@Override

 	protected Command getCreateCommand(CreateElementRequest req) {

 		if(UMLElementTypes.DurationConstraint_3023 == req.getElementType()) {

-			return getGEFWrapper(new CustomDurationConstraintCreateCommand(req));

+			return getGEFWrapper(new CustomDurationConstraintCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if(UMLElementTypes.DurationObservation_3024 == req.getElementType()) {

-			return getGEFWrapper(new CustomDurationObservationCreateCommand(req));

+			return getGEFWrapper(new CustomDurationObservationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomMessage3ItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomMessage3ItemSemanticEditPolicy.java
index 64a5b8a7cce..8a0adca4859 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomMessage3ItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomMessage3ItemSemanticEditPolicy.java
@@ -23,6 +23,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

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

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

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomCommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomConstraintConstrainedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomDurationConstraintCreateCommand;

@@ -70,10 +71,10 @@ public class CustomMessage3ItemSemanticEditPolicy extends Message3ItemSemanticEd
 	@Override

 	protected Command getCreateCommand(CreateElementRequest req) {

 		if(UMLElementTypes.DurationConstraint_3023 == req.getElementType()) {

-			return getGEFWrapper(new CustomDurationConstraintCreateCommand(req));

+			return getGEFWrapper(new CustomDurationConstraintCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if(UMLElementTypes.DurationObservation_3024 == req.getElementType()) {

-			return getGEFWrapper(new CustomDurationObservationCreateCommand(req));

+			return getGEFWrapper(new CustomDurationObservationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomMessage4ItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomMessage4ItemSemanticEditPolicy.java
index 79af282f9df..b06f09f1b90 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomMessage4ItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomMessage4ItemSemanticEditPolicy.java
@@ -23,6 +23,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

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

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

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomCommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomConstraintConstrainedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomDurationConstraintCreateCommand;

@@ -71,10 +72,10 @@ public class CustomMessage4ItemSemanticEditPolicy extends Message4ItemSemanticEd
 	@Override

 	protected Command getCreateCommand(CreateElementRequest req) {

 		if(UMLElementTypes.DurationConstraint_3023 == req.getElementType()) {

-			return getGEFWrapper(new CustomDurationConstraintCreateCommand(req));

+			return getGEFWrapper(new CustomDurationConstraintCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if(UMLElementTypes.DurationObservation_3024 == req.getElementType()) {

-			return getGEFWrapper(new CustomDurationObservationCreateCommand(req));

+			return getGEFWrapper(new CustomDurationObservationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomMessage5ItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomMessage5ItemSemanticEditPolicy.java
index be8f0da4b7d..1ff17e3e08f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomMessage5ItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomMessage5ItemSemanticEditPolicy.java
@@ -23,6 +23,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

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

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

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomCommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomConstraintConstrainedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomDurationConstraintCreateCommand;

@@ -70,10 +71,10 @@ public class CustomMessage5ItemSemanticEditPolicy extends Message5ItemSemanticEd
 	@Override

 	protected Command getCreateCommand(CreateElementRequest req) {

 		if(UMLElementTypes.DurationConstraint_3023 == req.getElementType()) {

-			return getGEFWrapper(new CustomDurationConstraintCreateCommand(req));

+			return getGEFWrapper(new CustomDurationConstraintCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if(UMLElementTypes.DurationObservation_3024 == req.getElementType()) {

-			return getGEFWrapper(new CustomDurationObservationCreateCommand(req));

+			return getGEFWrapper(new CustomDurationObservationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomMessage6ItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomMessage6ItemSemanticEditPolicy.java
index e2f3a907e1c..dff3856f165 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomMessage6ItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomMessage6ItemSemanticEditPolicy.java
@@ -23,6 +23,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

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

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

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomCommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomConstraintConstrainedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomDurationConstraintCreateCommand;

@@ -70,10 +71,10 @@ public class CustomMessage6ItemSemanticEditPolicy extends Message6ItemSemanticEd
 	@Override

 	protected Command getCreateCommand(CreateElementRequest req) {

 		if(UMLElementTypes.DurationConstraint_3023 == req.getElementType()) {

-			return getGEFWrapper(new CustomDurationConstraintCreateCommand(req));

+			return getGEFWrapper(new CustomDurationConstraintCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if(UMLElementTypes.DurationObservation_3024 == req.getElementType()) {

-			return getGEFWrapper(new CustomDurationObservationCreateCommand(req));

+			return getGEFWrapper(new CustomDurationObservationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomMessage7ItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomMessage7ItemSemanticEditPolicy.java
index 465e67f3f44..2e2b82ac8fd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomMessage7ItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomMessage7ItemSemanticEditPolicy.java
@@ -23,6 +23,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

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

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

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomCommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomConstraintConstrainedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomDurationConstraintCreateCommand;

@@ -70,10 +71,10 @@ public class CustomMessage7ItemSemanticEditPolicy extends Message7ItemSemanticEd
 	@Override

 	protected Command getCreateCommand(CreateElementRequest req) {

 		if(UMLElementTypes.DurationConstraint_3023 == req.getElementType()) {

-			return getGEFWrapper(new CustomDurationConstraintCreateCommand(req));

+			return getGEFWrapper(new CustomDurationConstraintCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if(UMLElementTypes.DurationObservation_3024 == req.getElementType()) {

-			return getGEFWrapper(new CustomDurationObservationCreateCommand(req));

+			return getGEFWrapper(new CustomDurationObservationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomMessageItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomMessageItemSemanticEditPolicy.java
index 1bc40b19bfb..bf6d84a1486 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomMessageItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomMessageItemSemanticEditPolicy.java
@@ -23,6 +23,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

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

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

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomCommentAnnotatedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomConstraintConstrainedElementReorientCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomDurationConstraintCreateCommand;

@@ -70,10 +71,10 @@ public class CustomMessageItemSemanticEditPolicy extends MessageItemSemanticEdit
 	@Override

 	protected Command getCreateCommand(CreateElementRequest req) {

 		if(UMLElementTypes.DurationConstraint_3023 == req.getElementType()) {

-			return getGEFWrapper(new CustomDurationConstraintCreateCommand(req));

+			return getGEFWrapper(new CustomDurationConstraintCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		if(UMLElementTypes.DurationObservation_3024 == req.getElementType()) {

-			return getGEFWrapper(new CustomDurationObservationCreateCommand(req));

+			return getGEFWrapper(new CustomDurationObservationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomPackageItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomPackageItemSemanticEditPolicy.java
index 3a2b208bbad..8fc2f65b830 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomPackageItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/semantic/CustomPackageItemSemanticEditPolicy.java
@@ -15,6 +15,7 @@ package org.eclipse.papyrus.uml.diagram.sequence.edit.policies.semantic;
 

 import org.eclipse.gef.commands.Command;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

 import org.eclipse.papyrus.uml.diagram.sequence.command.CustomInteractionCreateCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.PackageItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

@@ -30,7 +31,7 @@ public class CustomPackageItemSemanticEditPolicy extends PackageItemSemanticEdit
 	@Override

 	protected Command getCreateCommand(CreateElementRequest req) {

 		if(UMLElementTypes.Interaction_2001 == req.getElementType()) {

-			return getGEFWrapper(new CustomInteractionCreateCommand(req));

+			return getGEFWrapper(new CustomInteractionCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

 		}

 		return super.getCreateCommand(req);

 	}