[423052] Generate model, edit and editor code for sequence diagram.

And fix compilation pb in corresponding plugins
(org.eclipse.sirius.diagram.sequence,
org.eclipse.sirius.diagram.sequence.edit,
org.eclipse.sirius.editor.sequence).
Other compilations problems are split in a last commit
to facilitate the review.

Change-Id: Id93101fc94101ed2211fadee9753843a0a5201c7
Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>

41 files changed, 182 insertions, 132 deletions

diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/CombinedFragmentCreationToolItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/CombinedFragmentCreationToolItemProvider.java
index d407b4b485..836fb4dc45 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/CombinedFragmentCreationToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/CombinedFragmentCreationToolItemProvider.java
@@ -24,6 +24,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.sirius.diagram.description.tool.provider.ContainerCreationDescriptionItemProvider;
 import org.eclipse.sirius.diagram.sequence.description.DescriptionFactory;
 import org.eclipse.sirius.diagram.sequence.description.provider.SequenceEditPlugin;
 import org.eclipse.sirius.diagram.sequence.description.tool.CombinedFragmentCreationTool;
@@ -36,8 +37,8 @@ import org.eclipse.sirius.diagram.sequence.description.tool.ToolPackage;
  * 
  * @generated
  */
-public class CombinedFragmentCreationToolItemProvider extends org.eclipse.sirius.diagram.description.tool.provider.ContainerCreationDescriptionItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class CombinedFragmentCreationToolItemProvider extends ContainerCreationDescriptionItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider,
+        IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier. <!--
      * begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/ExecutionCreationToolItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/ExecutionCreationToolItemProvider.java
index b0f5d28acb..e0374b54fb 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/ExecutionCreationToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/ExecutionCreationToolItemProvider.java
@@ -24,6 +24,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.sirius.diagram.description.tool.provider.NodeCreationDescriptionItemProvider;
 import org.eclipse.sirius.diagram.sequence.description.DescriptionFactory;
 import org.eclipse.sirius.diagram.sequence.description.provider.SequenceEditPlugin;
 import org.eclipse.sirius.diagram.sequence.description.tool.ExecutionCreationTool;
@@ -36,8 +37,8 @@ import org.eclipse.sirius.diagram.sequence.description.tool.ToolPackage;
  * 
  * @generated
  */
-public class ExecutionCreationToolItemProvider extends org.eclipse.sirius.diagram.description.tool.provider.NodeCreationDescriptionItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class ExecutionCreationToolItemProvider extends NodeCreationDescriptionItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider,
+        IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier. <!--
      * begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/InstanceRoleCreationToolItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/InstanceRoleCreationToolItemProvider.java
index 7638635f5d..b79e487306 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/InstanceRoleCreationToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/InstanceRoleCreationToolItemProvider.java
@@ -24,6 +24,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.sirius.diagram.description.tool.provider.NodeCreationDescriptionItemProvider;
 import org.eclipse.sirius.diagram.sequence.description.provider.SequenceEditPlugin;
 import org.eclipse.sirius.diagram.sequence.description.tool.InstanceRoleCreationTool;
 import org.eclipse.sirius.diagram.sequence.description.tool.ToolPackage;
@@ -36,8 +37,8 @@ import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
  * 
  * @generated
  */
-public class InstanceRoleCreationToolItemProvider extends org.eclipse.sirius.diagram.description.tool.provider.NodeCreationDescriptionItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class InstanceRoleCreationToolItemProvider extends NodeCreationDescriptionItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider,
+        IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier. <!--
      * begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/InteractionUseCreationToolItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/InteractionUseCreationToolItemProvider.java
index b90c448f22..934af43946 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/InteractionUseCreationToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/InteractionUseCreationToolItemProvider.java
@@ -24,6 +24,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.sirius.diagram.description.tool.provider.ContainerCreationDescriptionItemProvider;
 import org.eclipse.sirius.diagram.sequence.description.DescriptionFactory;
 import org.eclipse.sirius.diagram.sequence.description.provider.SequenceEditPlugin;
 import org.eclipse.sirius.diagram.sequence.description.tool.InteractionUseCreationTool;
@@ -36,8 +37,8 @@ import org.eclipse.sirius.diagram.sequence.description.tool.ToolPackage;
  * 
  * @generated
  */
-public class InteractionUseCreationToolItemProvider extends org.eclipse.sirius.diagram.description.tool.provider.ContainerCreationDescriptionItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class InteractionUseCreationToolItemProvider extends ContainerCreationDescriptionItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider,
+        IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier. <!--
      * begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/LifelineCreationToolItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/LifelineCreationToolItemProvider.java
index ceb2eb33ba..e306253256 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/LifelineCreationToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/LifelineCreationToolItemProvider.java
@@ -22,6 +22,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.sirius.diagram.description.tool.provider.ContainerCreationDescriptionItemProvider;
 import org.eclipse.sirius.diagram.sequence.description.provider.SequenceEditPlugin;
 import org.eclipse.sirius.diagram.sequence.description.tool.LifelineCreationTool;
 
@@ -32,8 +33,8 @@ import org.eclipse.sirius.diagram.sequence.description.tool.LifelineCreationTool
  * 
  * @generated
  */
-public class LifelineCreationToolItemProvider extends org.eclipse.sirius.diagram.description.tool.provider.ContainerCreationDescriptionItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class LifelineCreationToolItemProvider extends ContainerCreationDescriptionItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider,
+        IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier. <!--
      * begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/ObservationPointCreationToolItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/ObservationPointCreationToolItemProvider.java
index eb4b711ead..cddc3ff922 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/ObservationPointCreationToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/ObservationPointCreationToolItemProvider.java
@@ -24,6 +24,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.sirius.diagram.description.tool.provider.NodeCreationDescriptionItemProvider;
 import org.eclipse.sirius.diagram.sequence.description.DescriptionFactory;
 import org.eclipse.sirius.diagram.sequence.description.provider.SequenceEditPlugin;
 import org.eclipse.sirius.diagram.sequence.description.tool.ObservationPointCreationTool;
@@ -36,8 +37,8 @@ import org.eclipse.sirius.diagram.sequence.description.tool.ToolPackage;
  * 
  * @generated
  */
-public class ObservationPointCreationToolItemProvider extends org.eclipse.sirius.diagram.description.tool.provider.NodeCreationDescriptionItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class ObservationPointCreationToolItemProvider extends NodeCreationDescriptionItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider,
+        IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier. <!--
      * begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/OperandCreationToolItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/OperandCreationToolItemProvider.java
index f97ed6ad31..7cfb8394c0 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/OperandCreationToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/OperandCreationToolItemProvider.java
@@ -24,6 +24,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.sirius.diagram.description.tool.provider.ContainerCreationDescriptionItemProvider;
 import org.eclipse.sirius.diagram.sequence.description.DescriptionFactory;
 import org.eclipse.sirius.diagram.sequence.description.provider.SequenceEditPlugin;
 import org.eclipse.sirius.diagram.sequence.description.tool.OperandCreationTool;
@@ -36,8 +37,8 @@ import org.eclipse.sirius.diagram.sequence.description.tool.ToolPackage;
  * 
  * @generated
  */
-public class OperandCreationToolItemProvider extends org.eclipse.sirius.diagram.description.tool.provider.ContainerCreationDescriptionItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class OperandCreationToolItemProvider extends ContainerCreationDescriptionItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider,
+        IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier. <!--
      * begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/StateCreationToolItemProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/StateCreationToolItemProvider.java
index 7d5c00a600..138c5f4ff7 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/StateCreationToolItemProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/provider/StateCreationToolItemProvider.java
@@ -24,6 +24,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.sirius.diagram.description.tool.provider.NodeCreationDescriptionItemProvider;
 import org.eclipse.sirius.diagram.sequence.description.DescriptionFactory;
 import org.eclipse.sirius.diagram.sequence.description.provider.SequenceEditPlugin;
 import org.eclipse.sirius.diagram.sequence.description.tool.StateCreationTool;
@@ -36,8 +37,8 @@ import org.eclipse.sirius.diagram.sequence.description.tool.ToolPackage;
  * 
  * @generated
  */
-public class StateCreationToolItemProvider extends org.eclipse.sirius.diagram.description.tool.provider.NodeCreationDescriptionItemProvider implements IEditingDomainItemProvider,
-        IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class StateCreationToolItemProvider extends NodeCreationDescriptionItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider,
+        IItemLabelProvider, IItemPropertySource {
     /**
      * This constructs an instance from a factory and a notifier. <!--
      * begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/util/DelegatingDiagramCommandFactory.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/util/DelegatingDiagramCommandFactory.java
index 721e679020..379a23abca 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/util/DelegatingDiagramCommandFactory.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/util/DelegatingDiagramCommandFactory.java
@@ -22,10 +22,12 @@ import org.eclipse.sirius.diagram.DDiagramElement;
 import org.eclipse.sirius.diagram.DDiagramElementContainer;
 import org.eclipse.sirius.diagram.DEdge;
 import org.eclipse.sirius.diagram.DNode;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.EdgeTarget;
 import org.eclipse.sirius.diagram.description.DiagramDescription;
 import org.eclipse.sirius.diagram.description.tool.BehaviorTool;
 import org.eclipse.sirius.diagram.description.tool.ContainerCreationDescription;
+import org.eclipse.sirius.diagram.description.tool.ContainerDropDescription;
 import org.eclipse.sirius.diagram.description.tool.DirectEditLabel;
 import org.eclipse.sirius.diagram.description.tool.DoubleClickDescription;
 import org.eclipse.sirius.diagram.description.tool.EdgeCreationDescription;
@@ -40,8 +42,6 @@ import org.eclipse.sirius.viewpoint.DLabelled;
 import org.eclipse.sirius.viewpoint.DRefreshable;
 import org.eclipse.sirius.viewpoint.DRepresentationElement;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
-import org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription;
 import org.eclipse.sirius.viewpoint.description.tool.ExternalJavaAction;
 import org.eclipse.sirius.viewpoint.description.tool.OperationAction;
 import org.eclipse.sirius.viewpoint.description.tool.PaneBasedSelectionWizardDescription;
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/model/sequence.ecore b/plugins/org.eclipse.sirius.diagram.sequence/model/sequence.ecore
index c9654e5237..700f0747ff 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/model/sequence.ecore
+++ b/plugins/org.eclipse.sirius.diagram.sequence/model/sequence.ecore
@@ -2,7 +2,7 @@
 <ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="sequence" nsURI="http://www.eclipse.org/sirius/diagram/sequence/2.0.0"
     nsPrefix="sequence">
-  <eClassifiers xsi:type="ecore:EClass" name="SequenceDDiagram" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//diagram/DSemanticDiagram">
+  <eClassifiers xsi:type="ecore:EClass" name="SequenceDDiagram" eSuperTypes="../../org.eclipse.sirius/model/diagram.ecore#//DSemanticDiagram">
     <eStructuralFeatures xsi:type="ecore:EReference" name="semanticOrdering" eType="#//ordering/EventEndsOrdering"
         transient="true" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="graphicalOrdering" eType="#//ordering/EventEndsOrdering"
@@ -12,7 +12,7 @@
   </eClassifiers>
   <eSubpackages name="description" nsURI="http://www.eclipse.org/sirius/diagram/sequence/description/2.0.0"
       nsPrefix="description">
-    <eClassifiers xsi:type="ecore:EClass" name="SequenceDiagramDescription" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//diagram/description/DiagramDescription">
+    <eClassifiers xsi:type="ecore:EClass" name="SequenceDiagramDescription" eSuperTypes="../../org.eclipse.sirius/model/diagram.ecore#//description/DiagramDescription">
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="endsOrdering" lowerBound="1"
           eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/InterpretedExpression">
         <eAnnotations source="http://www.eclipse.org/sirius/interpreted/expression/returnType">
@@ -30,7 +30,7 @@
         <eAnnotations source="http://www.eclipse.org/sirius/interpreted/expression/variables"/>
       </eStructuralFeatures>
     </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="InstanceRoleMapping" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//diagram/description/NodeMapping"/>
+    <eClassifiers xsi:type="ecore:EClass" name="InstanceRoleMapping" eSuperTypes="../../org.eclipse.sirius/model/diagram.ecore#//description/NodeMapping"/>
     <eClassifiers xsi:type="ecore:EClass" name="EventMapping" abstract="true"/>
     <eClassifiers xsi:type="ecore:EClass" name="DelimitedEventMapping" abstract="true"
         eSuperTypes="#//description/EventMapping">
@@ -49,10 +49,10 @@
         <eAnnotations source="http://www.eclipse.org/sirius/interpreted/expression/variables"/>
       </eStructuralFeatures>
     </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="ExecutionMapping" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//diagram/description/NodeMapping #//description/DelimitedEventMapping"/>
-    <eClassifiers xsi:type="ecore:EClass" name="StateMapping" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//diagram/description/NodeMapping #//description/DelimitedEventMapping"/>
-    <eClassifiers xsi:type="ecore:EClass" name="EndOfLifeMapping" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//diagram/description/NodeMapping"/>
-    <eClassifiers xsi:type="ecore:EClass" name="MessageMapping" abstract="true" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//diagram/description/EdgeMapping #//description/EventMapping">
+    <eClassifiers xsi:type="ecore:EClass" name="ExecutionMapping" eSuperTypes="../../org.eclipse.sirius/model/diagram.ecore#//description/NodeMapping #//description/DelimitedEventMapping"/>
+    <eClassifiers xsi:type="ecore:EClass" name="StateMapping" eSuperTypes="../../org.eclipse.sirius/model/diagram.ecore#//description/NodeMapping #//description/DelimitedEventMapping"/>
+    <eClassifiers xsi:type="ecore:EClass" name="EndOfLifeMapping" eSuperTypes="../../org.eclipse.sirius/model/diagram.ecore#//description/NodeMapping"/>
+    <eClassifiers xsi:type="ecore:EClass" name="MessageMapping" abstract="true" eSuperTypes="../../org.eclipse.sirius/model/diagram.ecore#//description/EdgeMapping #//description/EventMapping">
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="sendingEndFinderExpression"
           lowerBound="1" eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/InterpretedExpression">
         <eAnnotations source="http://www.eclipse.org/sirius/interpreted/expression/returnType">
@@ -82,7 +82,7 @@
     <eClassifiers xsi:type="ecore:EClass" name="DestructionMessageMapping" eSuperTypes="#//description/MessageMapping"/>
     <eClassifiers xsi:type="ecore:EClass" name="MessageEndVariable" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/AbstractVariable"/>
     <eClassifiers xsi:type="ecore:EClass" name="CoveredLifelinesVariable" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/AbstractVariable"/>
-    <eClassifiers xsi:type="ecore:EClass" name="FrameMapping" abstract="true" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//diagram/description/ContainerMapping #//description/DelimitedEventMapping">
+    <eClassifiers xsi:type="ecore:EClass" name="FrameMapping" abstract="true" eSuperTypes="../../org.eclipse.sirius/model/diagram.ecore#//description/ContainerMapping #//description/DelimitedEventMapping">
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="coveredLifelinesExpression"
           lowerBound="1" eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/InterpretedExpression">
         <eAnnotations source="http://www.eclipse.org/sirius/interpreted/expression/returnType">
@@ -100,8 +100,8 @@
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="InteractionUseMapping" eSuperTypes="#//description/FrameMapping"/>
     <eClassifiers xsi:type="ecore:EClass" name="CombinedFragmentMapping" eSuperTypes="#//description/FrameMapping"/>
-    <eClassifiers xsi:type="ecore:EClass" name="OperandMapping" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//diagram/description/ContainerMapping #//description/DelimitedEventMapping"/>
-    <eClassifiers xsi:type="ecore:EClass" name="ObservationPointMapping" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//diagram/description/NodeMapping"/>
+    <eClassifiers xsi:type="ecore:EClass" name="OperandMapping" eSuperTypes="../../org.eclipse.sirius/model/diagram.ecore#//description/ContainerMapping #//description/DelimitedEventMapping"/>
+    <eClassifiers xsi:type="ecore:EClass" name="ObservationPointMapping" eSuperTypes="../../org.eclipse.sirius/model/diagram.ecore#//description/NodeMapping"/>
     <eSubpackages name="tool" nsURI="http://www.eclipse.org/sirius/diagram/sequence/description/tool/2.0.0"
         nsPrefix="tool">
       <eClassifiers xsi:type="ecore:EClass" name="SequenceDiagramToolDescription"/>
@@ -123,7 +123,7 @@
         <eStructuralFeatures xsi:type="ecore:EReference" name="coveredLifelines" lowerBound="1"
             eType="#//description/CoveredLifelinesVariable" containment="true"/>
       </eClassifiers>
-      <eClassifiers xsi:type="ecore:EClass" name="InstanceRoleCreationTool" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//diagram/description/tool/NodeCreationDescription #//description/tool/SequenceDiagramToolDescription">
+      <eClassifiers xsi:type="ecore:EClass" name="InstanceRoleCreationTool" eSuperTypes="../../org.eclipse.sirius/model/diagram.ecore#//description/tool/NodeCreationDescription #//description/tool/SequenceDiagramToolDescription">
         <eStructuralFeatures xsi:type="ecore:EReference" name="predecessor" eType="ecore:EClass ../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/ElementVariable"
             containment="true">
           <eAnnotations source="toolVariable">
@@ -131,14 +131,14 @@
           </eAnnotations>
         </eStructuralFeatures>
       </eClassifiers>
-      <eClassifiers xsi:type="ecore:EClass" name="LifelineCreationTool" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//diagram/description/tool/ContainerCreationDescription #//description/tool/SequenceDiagramToolDescription"/>
-      <eClassifiers xsi:type="ecore:EClass" name="MessageCreationTool" eSuperTypes="#//description/tool/SequenceDiagramToolDescription ../../org.eclipse.sirius/model/viewpoint.ecore#//diagram/description/tool/EdgeCreationDescription #//description/tool/OrderedElementCreationTool"/>
-      <eClassifiers xsi:type="ecore:EClass" name="ExecutionCreationTool" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//diagram/description/tool/NodeCreationDescription #//description/tool/SequenceDiagramToolDescription #//description/tool/OrderedElementCreationTool"/>
-      <eClassifiers xsi:type="ecore:EClass" name="StateCreationTool" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//diagram/description/tool/NodeCreationDescription #//description/tool/SequenceDiagramToolDescription #//description/tool/OrderedElementCreationTool"/>
-      <eClassifiers xsi:type="ecore:EClass" name="InteractionUseCreationTool" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//diagram/description/tool/ContainerCreationDescription #//description/tool/SequenceDiagramToolDescription #//description/tool/OrderedElementCreationTool #//description/tool/CoveringElementCreationTool"/>
-      <eClassifiers xsi:type="ecore:EClass" name="CombinedFragmentCreationTool" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//diagram/description/tool/ContainerCreationDescription #//description/tool/SequenceDiagramToolDescription #//description/tool/OrderedElementCreationTool #//description/tool/CoveringElementCreationTool"/>
-      <eClassifiers xsi:type="ecore:EClass" name="OperandCreationTool" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//diagram/description/tool/ContainerCreationDescription #//description/tool/SequenceDiagramToolDescription #//description/tool/OrderedElementCreationTool"/>
-      <eClassifiers xsi:type="ecore:EClass" name="ObservationPointCreationTool" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//diagram/description/tool/NodeCreationDescription #//description/tool/SequenceDiagramToolDescription #//description/tool/OrderedElementCreationTool"/>
+      <eClassifiers xsi:type="ecore:EClass" name="LifelineCreationTool" eSuperTypes="../../org.eclipse.sirius/model/diagram.ecore#//description/tool/ContainerCreationDescription #//description/tool/SequenceDiagramToolDescription"/>
+      <eClassifiers xsi:type="ecore:EClass" name="MessageCreationTool" eSuperTypes="#//description/tool/SequenceDiagramToolDescription ../../org.eclipse.sirius/model/diagram.ecore#//description/tool/EdgeCreationDescription #//description/tool/OrderedElementCreationTool"/>
+      <eClassifiers xsi:type="ecore:EClass" name="ExecutionCreationTool" eSuperTypes="../../org.eclipse.sirius/model/diagram.ecore#//description/tool/NodeCreationDescription #//description/tool/SequenceDiagramToolDescription #//description/tool/OrderedElementCreationTool"/>
+      <eClassifiers xsi:type="ecore:EClass" name="StateCreationTool" eSuperTypes="../../org.eclipse.sirius/model/diagram.ecore#//description/tool/NodeCreationDescription #//description/tool/SequenceDiagramToolDescription #//description/tool/OrderedElementCreationTool"/>
+      <eClassifiers xsi:type="ecore:EClass" name="InteractionUseCreationTool" eSuperTypes="../../org.eclipse.sirius/model/diagram.ecore#//description/tool/ContainerCreationDescription #//description/tool/SequenceDiagramToolDescription #//description/tool/OrderedElementCreationTool #//description/tool/CoveringElementCreationTool"/>
+      <eClassifiers xsi:type="ecore:EClass" name="CombinedFragmentCreationTool" eSuperTypes="../../org.eclipse.sirius/model/diagram.ecore#//description/tool/ContainerCreationDescription #//description/tool/SequenceDiagramToolDescription #//description/tool/OrderedElementCreationTool #//description/tool/CoveringElementCreationTool"/>
+      <eClassifiers xsi:type="ecore:EClass" name="OperandCreationTool" eSuperTypes="../../org.eclipse.sirius/model/diagram.ecore#//description/tool/ContainerCreationDescription #//description/tool/SequenceDiagramToolDescription #//description/tool/OrderedElementCreationTool"/>
+      <eClassifiers xsi:type="ecore:EClass" name="ObservationPointCreationTool" eSuperTypes="../../org.eclipse.sirius/model/diagram.ecore#//description/tool/NodeCreationDescription #//description/tool/SequenceDiagramToolDescription #//description/tool/OrderedElementCreationTool"/>
       <eClassifiers xsi:type="ecore:EClass" name="ReorderTool" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/AbstractToolDescription #//description/tool/SequenceDiagramToolDescription">
         <eStructuralFeatures xsi:type="ecore:EReference" name="mappings" upperBound="-1"
             eType="#//description/EventMapping"/>
@@ -292,12 +292,12 @@
       <eStructuralFeatures xsi:type="ecore:EReference" name="executionMappings" upperBound="-1"
           eType="#//template/TExecutionMapping" containment="true"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="instanceRoleStyle" lowerBound="1"
-          eType="ecore:EClass ../../org.eclipse.sirius/model/viewpoint.ecore#//diagram/description/style/NodeStyleDescription"
+          eType="ecore:EClass ../../org.eclipse.sirius/model/diagram.ecore#//description/style/NodeStyleDescription"
           containment="true"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="lifelineStyle" lowerBound="1"
           eType="#//template/TLifelineStyle" containment="true"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="endOfLifeStyle" lowerBound="1"
-          eType="ecore:EClass ../../org.eclipse.sirius/model/viewpoint.ecore#//diagram/description/style/NodeStyleDescription"
+          eType="ecore:EClass ../../org.eclipse.sirius/model/diagram.ecore#//description/style/NodeStyleDescription"
           containment="true"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="conditionalLifeLineStyles"
           upperBound="-1" eType="#//template/TConditionalLifelineStyle" containment="true">
@@ -423,20 +423,20 @@
           <details key="documentation" value="The color of the edge."/>
         </eAnnotations>
       </eStructuralFeatures>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="lineStyle" eType="ecore:EEnum ../../org.eclipse.sirius/model/viewpoint.ecore#//diagram/LineStyle">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="lineStyle" eType="ecore:EEnum ../../org.eclipse.sirius/model/diagram.ecore#//LineStyle">
         <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
           <details key="documentation" value="The style of the line."/>
         </eAnnotations>
       </eStructuralFeatures>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="sourceArrow" lowerBound="1"
-          eType="ecore:EEnum ../../org.eclipse.sirius/model/viewpoint.ecore#//diagram/EdgeArrows"
+          eType="ecore:EEnum ../../org.eclipse.sirius/model/diagram.ecore#//EdgeArrows"
           defaultValueLiteral="NoDecoration">
         <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
           <details key="documentation" value="The source decoration."/>
         </eAnnotations>
       </eStructuralFeatures>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="targetArrow" lowerBound="1"
-          eType="ecore:EEnum ../../org.eclipse.sirius/model/viewpoint.ecore#//diagram/EdgeArrows"
+          eType="ecore:EEnum ../../org.eclipse.sirius/model/diagram.ecore#//EdgeArrows"
           defaultValueLiteral="InputArrow">
         <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
           <details key="documentation" value="The target decoration."/>
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/model/sequence.genmodel b/plugins/org.eclipse.sirius.diagram.sequence/model/sequence.genmodel
index 4db9c1cf0f..71423cc516 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/model/sequence.genmodel
+++ b/plugins/org.eclipse.sirius.diagram.sequence/model/sequence.genmodel
@@ -7,7 +7,7 @@
     editorPluginClass="org.eclipse.sirius.diagram.sequence.description.presentation.SequenceEditorPlugin"
     codeFormatting="true" testsDirectory="" testSuiteClass="org.eclipse.sirius.diagram.sequence.description.tests.SequenceAllTests"
     importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
-    runtimeVersion="2.3" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.sirius/model/viewpoint.genmodel#//viewpoint">
+    runtimeVersion="2.3" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.sirius/model/viewpoint.genmodel#//viewpoint ../../org.eclipse.sirius/model/viewpoint.genmodel#//diagram">
   <foreignModel>sequence.ecore</foreignModel>
   <genPackages prefix="Sequence" basePackage="org.eclipse.sirius.diagram" disposableProviderFactory="true"
       ecorePackage="sequence.ecore#/">
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/DescriptionPackageImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/DescriptionPackageImpl.java
index 8741c3eaeb..10b4541ca9 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/DescriptionPackageImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/impl/DescriptionPackageImpl.java
@@ -14,6 +14,7 @@ import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
+import org.eclipse.sirius.diagram.DiagramPackage;
 import org.eclipse.sirius.diagram.sequence.SequencePackage;
 import org.eclipse.sirius.diagram.sequence.description.BasicMessageMapping;
 import org.eclipse.sirius.diagram.sequence.description.CombinedFragmentMapping;
@@ -238,6 +239,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
 
         // Initialize simple dependencies
         ViewpointPackage.eINSTANCE.eClass();
+        DiagramPackage.eINSTANCE.eClass();
 
         // Obtain or create and register interdependencies
         SequencePackageImpl theSequencePackage = (SequencePackageImpl) (EPackage.Registry.INSTANCE.getEPackage(SequencePackage.eNS_URI) instanceof SequencePackageImpl ? EPackage.Registry.INSTANCE
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/CombinedFragmentCreationTool.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/CombinedFragmentCreationTool.java
index 6cad002f89..e1f1252d08 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/CombinedFragmentCreationTool.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/CombinedFragmentCreationTool.java
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package org.eclipse.sirius.diagram.sequence.description.tool;
 
+import org.eclipse.sirius.diagram.description.tool.ContainerCreationDescription;
+
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Combined Fragment Creation Tool</b></em>'. <!-- end-user-doc -->
@@ -19,7 +21,6 @@ package org.eclipse.sirius.diagram.sequence.description.tool;
  * @model
  * @generated
  */
-public interface CombinedFragmentCreationTool extends org.eclipse.sirius.diagram.description.tool.ContainerCreationDescription, SequenceDiagramToolDescription, OrderedElementCreationTool,
-        CoveringElementCreationTool {
+public interface CombinedFragmentCreationTool extends ContainerCreationDescription, SequenceDiagramToolDescription, OrderedElementCreationTool, CoveringElementCreationTool {
 
 } // CombinedFragmentCreationTool
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/ExecutionCreationTool.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/ExecutionCreationTool.java
index 605d4ef99e..726356b9b4 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/ExecutionCreationTool.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/ExecutionCreationTool.java
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package org.eclipse.sirius.diagram.sequence.description.tool;
 
+import org.eclipse.sirius.diagram.description.tool.NodeCreationDescription;
+
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Execution Creation Tool</b></em>'. <!-- end-user-doc -->
@@ -19,5 +21,5 @@ package org.eclipse.sirius.diagram.sequence.description.tool;
  * @model
  * @generated
  */
-public interface ExecutionCreationTool extends org.eclipse.sirius.diagram.description.tool.NodeCreationDescription, SequenceDiagramToolDescription, OrderedElementCreationTool {
+public interface ExecutionCreationTool extends NodeCreationDescription, SequenceDiagramToolDescription, OrderedElementCreationTool {
 } // ExecutionCreationTool
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/InstanceRoleCreationTool.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/InstanceRoleCreationTool.java
index a258699ac3..3e6ea0ea56 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/InstanceRoleCreationTool.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/InstanceRoleCreationTool.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.sirius.diagram.sequence.description.tool;
 
+import org.eclipse.sirius.diagram.description.tool.NodeCreationDescription;
 import org.eclipse.sirius.viewpoint.description.tool.ElementVariable;
 
 /**
@@ -29,7 +30,7 @@ import org.eclipse.sirius.viewpoint.description.tool.ElementVariable;
  * @model
  * @generated
  */
-public interface InstanceRoleCreationTool extends org.eclipse.sirius.diagram.description.tool.NodeCreationDescription, SequenceDiagramToolDescription {
+public interface InstanceRoleCreationTool extends NodeCreationDescription, SequenceDiagramToolDescription {
     /**
      * Returns the value of the '<em><b>Predecessor</b></em>' containment
      * reference. <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/InteractionUseCreationTool.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/InteractionUseCreationTool.java
index 97d2e8ef6b..ec654cc4b8 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/InteractionUseCreationTool.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/InteractionUseCreationTool.java
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package org.eclipse.sirius.diagram.sequence.description.tool;
 
+import org.eclipse.sirius.diagram.description.tool.ContainerCreationDescription;
+
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Interaction Use Creation Tool</b></em>'. <!-- end-user-doc -->
@@ -19,7 +21,6 @@ package org.eclipse.sirius.diagram.sequence.description.tool;
  * @model
  * @generated
  */
-public interface InteractionUseCreationTool extends org.eclipse.sirius.diagram.description.tool.ContainerCreationDescription, SequenceDiagramToolDescription, OrderedElementCreationTool,
-        CoveringElementCreationTool {
+public interface InteractionUseCreationTool extends ContainerCreationDescription, SequenceDiagramToolDescription, OrderedElementCreationTool, CoveringElementCreationTool {
 
 } // InteractionUseCreationTool
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/LifelineCreationTool.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/LifelineCreationTool.java
index d2318b678e..9aed6dc9fd 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/LifelineCreationTool.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/LifelineCreationTool.java
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package org.eclipse.sirius.diagram.sequence.description.tool;
 
+import org.eclipse.sirius.diagram.description.tool.ContainerCreationDescription;
+
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Lifeline Creation Tool</b></em>'. <!-- end-user-doc -->
@@ -19,5 +21,5 @@ package org.eclipse.sirius.diagram.sequence.description.tool;
  * @model
  * @generated
  */
-public interface LifelineCreationTool extends org.eclipse.sirius.diagram.description.tool.ContainerCreationDescription, SequenceDiagramToolDescription {
+public interface LifelineCreationTool extends ContainerCreationDescription, SequenceDiagramToolDescription {
 } // LifelineCreationTool
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/MessageCreationTool.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/MessageCreationTool.java
index 0edf1d1a56..bfc258a37c 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/MessageCreationTool.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/MessageCreationTool.java
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package org.eclipse.sirius.diagram.sequence.description.tool;
 
+import org.eclipse.sirius.diagram.description.tool.EdgeCreationDescription;
+
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Message Creation Tool</b></em>'. <!-- end-user-doc -->
@@ -19,6 +21,6 @@ package org.eclipse.sirius.diagram.sequence.description.tool;
  * @model
  * @generated
  */
-public interface MessageCreationTool extends SequenceDiagramToolDescription, org.eclipse.sirius.diagram.description.tool.EdgeCreationDescription, OrderedElementCreationTool {
+public interface MessageCreationTool extends SequenceDiagramToolDescription, EdgeCreationDescription, OrderedElementCreationTool {
 
 } // MessageCreationTool
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/ObservationPointCreationTool.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/ObservationPointCreationTool.java
index b6af6b14e3..5f49780d1a 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/ObservationPointCreationTool.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/ObservationPointCreationTool.java
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package org.eclipse.sirius.diagram.sequence.description.tool;
 
+import org.eclipse.sirius.diagram.description.tool.NodeCreationDescription;
+
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Obervation Point Creation Tool</b></em>'. <!-- end-user-doc -->
@@ -19,5 +21,5 @@ package org.eclipse.sirius.diagram.sequence.description.tool;
  * @model
  * @generated
  */
-public interface ObservationPointCreationTool extends org.eclipse.sirius.diagram.description.tool.NodeCreationDescription, SequenceDiagramToolDescription, OrderedElementCreationTool {
+public interface ObservationPointCreationTool extends NodeCreationDescription, SequenceDiagramToolDescription, OrderedElementCreationTool {
 } // ObservationPointCreationTool
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/OperandCreationTool.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/OperandCreationTool.java
index ff3605b76e..c5361fceed 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/OperandCreationTool.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/OperandCreationTool.java
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package org.eclipse.sirius.diagram.sequence.description.tool;
 
+import org.eclipse.sirius.diagram.description.tool.ContainerCreationDescription;
+
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Operand Creation Tool</b></em>'. <!-- end-user-doc -->
@@ -19,6 +21,6 @@ package org.eclipse.sirius.diagram.sequence.description.tool;
  * @model
  * @generated
  */
-public interface OperandCreationTool extends org.eclipse.sirius.diagram.description.tool.ContainerCreationDescription, SequenceDiagramToolDescription, OrderedElementCreationTool {
+public interface OperandCreationTool extends ContainerCreationDescription, SequenceDiagramToolDescription, OrderedElementCreationTool {
 
 } // OperandCreationTool
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/StateCreationTool.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/StateCreationTool.java
index 6d1b90b7bc..b20d75a9b5 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/StateCreationTool.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/StateCreationTool.java
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package org.eclipse.sirius.diagram.sequence.description.tool;
 
+import org.eclipse.sirius.diagram.description.tool.NodeCreationDescription;
+
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>State Creation Tool</b></em>'. <!-- end-user-doc -->
@@ -19,5 +21,5 @@ package org.eclipse.sirius.diagram.sequence.description.tool;
  * @model
  * @generated
  */
-public interface StateCreationTool extends org.eclipse.sirius.diagram.description.tool.NodeCreationDescription, SequenceDiagramToolDescription, OrderedElementCreationTool {
+public interface StateCreationTool extends NodeCreationDescription, SequenceDiagramToolDescription, OrderedElementCreationTool {
 } // StateCreationTool
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/CombinedFragmentCreationToolImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/CombinedFragmentCreationToolImpl.java
index 4b2e824126..afc4fa7de0 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/CombinedFragmentCreationToolImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/CombinedFragmentCreationToolImpl.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.sirius.diagram.description.tool.impl.ContainerCreationDescriptionImpl;
 import org.eclipse.sirius.diagram.sequence.description.CoveredLifelinesVariable;
 import org.eclipse.sirius.diagram.sequence.description.MessageEndVariable;
 import org.eclipse.sirius.diagram.sequence.description.tool.CombinedFragmentCreationTool;
@@ -43,7 +44,7 @@ import org.eclipse.sirius.diagram.sequence.description.tool.ToolPackage;
  * 
  * @generated
  */
-public class CombinedFragmentCreationToolImpl extends org.eclipse.sirius.diagram.description.tool.impl.ContainerCreationDescriptionImpl implements CombinedFragmentCreationTool {
+public class CombinedFragmentCreationToolImpl extends ContainerCreationDescriptionImpl implements CombinedFragmentCreationTool {
     /**
      * The cached value of the '{@link #getStartingEndPredecessor()
      * <em>Starting End Predecessor</em>}' containment reference. <!--
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/ExecutionCreationToolImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/ExecutionCreationToolImpl.java
index d93d365c53..ec0f55c5e0 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/ExecutionCreationToolImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/ExecutionCreationToolImpl.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.sirius.diagram.description.tool.impl.NodeCreationDescriptionImpl;
 import org.eclipse.sirius.diagram.sequence.description.MessageEndVariable;
 import org.eclipse.sirius.diagram.sequence.description.tool.ExecutionCreationTool;
 import org.eclipse.sirius.diagram.sequence.description.tool.OrderedElementCreationTool;
@@ -38,7 +39,7 @@ import org.eclipse.sirius.diagram.sequence.description.tool.ToolPackage;
  * 
  * @generated
  */
-public class ExecutionCreationToolImpl extends org.eclipse.sirius.diagram.description.tool.impl.NodeCreationDescriptionImpl implements ExecutionCreationTool {
+public class ExecutionCreationToolImpl extends NodeCreationDescriptionImpl implements ExecutionCreationTool {
     /**
      * The cached value of the '{@link #getStartingEndPredecessor()
      * <em>Starting End Predecessor</em>}' containment reference. <!--
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/InstanceRoleCreationToolImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/InstanceRoleCreationToolImpl.java
index c7fbea4b20..9308ef3123 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/InstanceRoleCreationToolImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/InstanceRoleCreationToolImpl.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.sirius.diagram.description.tool.impl.NodeCreationDescriptionImpl;
 import org.eclipse.sirius.diagram.sequence.description.tool.InstanceRoleCreationTool;
 import org.eclipse.sirius.diagram.sequence.description.tool.ToolPackage;
 import org.eclipse.sirius.viewpoint.description.tool.ElementVariable;
@@ -33,7 +34,7 @@ import org.eclipse.sirius.viewpoint.description.tool.ElementVariable;
  * 
  * @generated
  */
-public class InstanceRoleCreationToolImpl extends org.eclipse.sirius.diagram.description.tool.impl.NodeCreationDescriptionImpl implements InstanceRoleCreationTool {
+public class InstanceRoleCreationToolImpl extends NodeCreationDescriptionImpl implements InstanceRoleCreationTool {
     /**
      * The cached value of the '{@link #getPredecessor() <em>Predecessor</em>}'
      * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/InteractionUseCreationToolImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/InteractionUseCreationToolImpl.java
index 4665c6ab16..04b28ae3bc 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/InteractionUseCreationToolImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/InteractionUseCreationToolImpl.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.sirius.diagram.description.tool.impl.ContainerCreationDescriptionImpl;
 import org.eclipse.sirius.diagram.sequence.description.CoveredLifelinesVariable;
 import org.eclipse.sirius.diagram.sequence.description.MessageEndVariable;
 import org.eclipse.sirius.diagram.sequence.description.tool.CoveringElementCreationTool;
@@ -43,7 +44,7 @@ import org.eclipse.sirius.diagram.sequence.description.tool.ToolPackage;
  * 
  * @generated
  */
-public class InteractionUseCreationToolImpl extends org.eclipse.sirius.diagram.description.tool.impl.ContainerCreationDescriptionImpl implements InteractionUseCreationTool {
+public class InteractionUseCreationToolImpl extends ContainerCreationDescriptionImpl implements InteractionUseCreationTool {
     /**
      * The cached value of the '{@link #getStartingEndPredecessor()
      * <em>Starting End Predecessor</em>}' containment reference. <!--
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/LifelineCreationToolImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/LifelineCreationToolImpl.java
index e8e9a1291a..77cdd8bece 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/LifelineCreationToolImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/LifelineCreationToolImpl.java
@@ -11,6 +11,7 @@
 package org.eclipse.sirius.diagram.sequence.description.tool.impl;
 
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.sirius.diagram.description.tool.impl.ContainerCreationDescriptionImpl;
 import org.eclipse.sirius.diagram.sequence.description.tool.LifelineCreationTool;
 import org.eclipse.sirius.diagram.sequence.description.tool.ToolPackage;
 
@@ -22,7 +23,7 @@ import org.eclipse.sirius.diagram.sequence.description.tool.ToolPackage;
  * 
  * @generated
  */
-public class LifelineCreationToolImpl extends org.eclipse.sirius.diagram.description.tool.impl.ContainerCreationDescriptionImpl implements LifelineCreationTool {
+public class LifelineCreationToolImpl extends ContainerCreationDescriptionImpl implements LifelineCreationTool {
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/MessageCreationToolImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/MessageCreationToolImpl.java
index fdfdcca863..d15c3de97e 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/MessageCreationToolImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/MessageCreationToolImpl.java
@@ -25,6 +25,11 @@ import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.sirius.diagram.EdgeTarget;
 import org.eclipse.sirius.diagram.description.DiagramElementMapping;
 import org.eclipse.sirius.diagram.description.EdgeMapping;
+import org.eclipse.sirius.diagram.description.tool.EdgeCreationDescription;
+import org.eclipse.sirius.diagram.description.tool.SourceEdgeCreationVariable;
+import org.eclipse.sirius.diagram.description.tool.SourceEdgeViewCreationVariable;
+import org.eclipse.sirius.diagram.description.tool.TargetEdgeCreationVariable;
+import org.eclipse.sirius.diagram.description.tool.TargetEdgeViewCreationVariable;
 import org.eclipse.sirius.diagram.sequence.description.MessageEndVariable;
 import org.eclipse.sirius.diagram.sequence.description.tool.MessageCreationTool;
 import org.eclipse.sirius.diagram.sequence.description.tool.OrderedElementCreationTool;
@@ -238,7 +243,7 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl
      * @generated
      * @ordered
      */
-    protected org.eclipse.sirius.diagram.description.tool.SourceEdgeCreationVariable sourceVariable;
+    protected SourceEdgeCreationVariable sourceVariable;
 
     /**
      * The cached value of the '{@link #getTargetVariable()
@@ -249,7 +254,7 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl
      * @generated
      * @ordered
      */
-    protected org.eclipse.sirius.diagram.description.tool.TargetEdgeCreationVariable targetVariable;
+    protected TargetEdgeCreationVariable targetVariable;
 
     /**
      * The cached value of the '{@link #getSourceViewVariable()
@@ -260,7 +265,7 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl
      * @generated
      * @ordered
      */
-    protected org.eclipse.sirius.diagram.description.tool.SourceEdgeViewCreationVariable sourceViewVariable;
+    protected SourceEdgeViewCreationVariable sourceViewVariable;
 
     /**
      * The cached value of the '{@link #getTargetViewVariable()
@@ -271,7 +276,7 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl
      * @generated
      * @ordered
      */
-    protected org.eclipse.sirius.diagram.description.tool.TargetEdgeViewCreationVariable targetViewVariable;
+    protected TargetEdgeViewCreationVariable targetViewVariable;
 
     /**
      * The cached value of the '{@link #getInitialOperation()
@@ -523,10 +528,10 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl
      * 
      * @generated
      */
-    public org.eclipse.sirius.diagram.description.tool.SourceEdgeCreationVariable getSourceVariable() {
+    public SourceEdgeCreationVariable getSourceVariable() {
         if (sourceVariable != null && sourceVariable.eIsProxy()) {
             InternalEObject oldSourceVariable = (InternalEObject) sourceVariable;
-            sourceVariable = (org.eclipse.sirius.diagram.description.tool.SourceEdgeCreationVariable) eResolveProxy(oldSourceVariable);
+            sourceVariable = (SourceEdgeCreationVariable) eResolveProxy(oldSourceVariable);
             if (sourceVariable != oldSourceVariable) {
                 InternalEObject newSourceVariable = (InternalEObject) sourceVariable;
                 NotificationChain msgs = oldSourceVariable.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ToolPackage.MESSAGE_CREATION_TOOL__SOURCE_VARIABLE, null, null);
@@ -547,7 +552,7 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl
      * 
      * @generated
      */
-    public org.eclipse.sirius.diagram.description.tool.SourceEdgeCreationVariable basicGetSourceVariable() {
+    public SourceEdgeCreationVariable basicGetSourceVariable() {
         return sourceVariable;
     }
 
@@ -556,8 +561,8 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl
      * 
      * @generated
      */
-    public NotificationChain basicSetSourceVariable(org.eclipse.sirius.diagram.description.tool.SourceEdgeCreationVariable newSourceVariable, NotificationChain msgs) {
-        org.eclipse.sirius.diagram.description.tool.SourceEdgeCreationVariable oldSourceVariable = sourceVariable;
+    public NotificationChain basicSetSourceVariable(SourceEdgeCreationVariable newSourceVariable, NotificationChain msgs) {
+        SourceEdgeCreationVariable oldSourceVariable = sourceVariable;
         sourceVariable = newSourceVariable;
         if (eNotificationRequired()) {
             ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ToolPackage.MESSAGE_CREATION_TOOL__SOURCE_VARIABLE, oldSourceVariable, newSourceVariable);
@@ -574,7 +579,7 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl
      * 
      * @generated
      */
-    public void setSourceVariable(org.eclipse.sirius.diagram.description.tool.SourceEdgeCreationVariable newSourceVariable) {
+    public void setSourceVariable(SourceEdgeCreationVariable newSourceVariable) {
         if (newSourceVariable != sourceVariable) {
             NotificationChain msgs = null;
             if (sourceVariable != null)
@@ -593,10 +598,10 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl
      * 
      * @generated
      */
-    public org.eclipse.sirius.diagram.description.tool.TargetEdgeCreationVariable getTargetVariable() {
+    public TargetEdgeCreationVariable getTargetVariable() {
         if (targetVariable != null && targetVariable.eIsProxy()) {
             InternalEObject oldTargetVariable = (InternalEObject) targetVariable;
-            targetVariable = (org.eclipse.sirius.diagram.description.tool.TargetEdgeCreationVariable) eResolveProxy(oldTargetVariable);
+            targetVariable = (TargetEdgeCreationVariable) eResolveProxy(oldTargetVariable);
             if (targetVariable != oldTargetVariable) {
                 InternalEObject newTargetVariable = (InternalEObject) targetVariable;
                 NotificationChain msgs = oldTargetVariable.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ToolPackage.MESSAGE_CREATION_TOOL__TARGET_VARIABLE, null, null);
@@ -617,7 +622,7 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl
      * 
      * @generated
      */
-    public org.eclipse.sirius.diagram.description.tool.TargetEdgeCreationVariable basicGetTargetVariable() {
+    public TargetEdgeCreationVariable basicGetTargetVariable() {
         return targetVariable;
     }
 
@@ -626,8 +631,8 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl
      * 
      * @generated
      */
-    public NotificationChain basicSetTargetVariable(org.eclipse.sirius.diagram.description.tool.TargetEdgeCreationVariable newTargetVariable, NotificationChain msgs) {
-        org.eclipse.sirius.diagram.description.tool.TargetEdgeCreationVariable oldTargetVariable = targetVariable;
+    public NotificationChain basicSetTargetVariable(TargetEdgeCreationVariable newTargetVariable, NotificationChain msgs) {
+        TargetEdgeCreationVariable oldTargetVariable = targetVariable;
         targetVariable = newTargetVariable;
         if (eNotificationRequired()) {
             ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ToolPackage.MESSAGE_CREATION_TOOL__TARGET_VARIABLE, oldTargetVariable, newTargetVariable);
@@ -644,7 +649,7 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl
      * 
      * @generated
      */
-    public void setTargetVariable(org.eclipse.sirius.diagram.description.tool.TargetEdgeCreationVariable newTargetVariable) {
+    public void setTargetVariable(TargetEdgeCreationVariable newTargetVariable) {
         if (newTargetVariable != targetVariable) {
             NotificationChain msgs = null;
             if (targetVariable != null)
@@ -663,10 +668,10 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl
      * 
      * @generated
      */
-    public org.eclipse.sirius.diagram.description.tool.SourceEdgeViewCreationVariable getSourceViewVariable() {
+    public SourceEdgeViewCreationVariable getSourceViewVariable() {
         if (sourceViewVariable != null && sourceViewVariable.eIsProxy()) {
             InternalEObject oldSourceViewVariable = (InternalEObject) sourceViewVariable;
-            sourceViewVariable = (org.eclipse.sirius.diagram.description.tool.SourceEdgeViewCreationVariable) eResolveProxy(oldSourceViewVariable);
+            sourceViewVariable = (SourceEdgeViewCreationVariable) eResolveProxy(oldSourceViewVariable);
             if (sourceViewVariable != oldSourceViewVariable) {
                 InternalEObject newSourceViewVariable = (InternalEObject) sourceViewVariable;
                 NotificationChain msgs = oldSourceViewVariable.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ToolPackage.MESSAGE_CREATION_TOOL__SOURCE_VIEW_VARIABLE, null, null);
@@ -687,7 +692,7 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl
      * 
      * @generated
      */
-    public org.eclipse.sirius.diagram.description.tool.SourceEdgeViewCreationVariable basicGetSourceViewVariable() {
+    public SourceEdgeViewCreationVariable basicGetSourceViewVariable() {
         return sourceViewVariable;
     }
 
@@ -696,8 +701,8 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl
      * 
      * @generated
      */
-    public NotificationChain basicSetSourceViewVariable(org.eclipse.sirius.diagram.description.tool.SourceEdgeViewCreationVariable newSourceViewVariable, NotificationChain msgs) {
-        org.eclipse.sirius.diagram.description.tool.SourceEdgeViewCreationVariable oldSourceViewVariable = sourceViewVariable;
+    public NotificationChain basicSetSourceViewVariable(SourceEdgeViewCreationVariable newSourceViewVariable, NotificationChain msgs) {
+        SourceEdgeViewCreationVariable oldSourceViewVariable = sourceViewVariable;
         sourceViewVariable = newSourceViewVariable;
         if (eNotificationRequired()) {
             ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ToolPackage.MESSAGE_CREATION_TOOL__SOURCE_VIEW_VARIABLE, oldSourceViewVariable, newSourceViewVariable);
@@ -714,7 +719,7 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl
      * 
      * @generated
      */
-    public void setSourceViewVariable(org.eclipse.sirius.diagram.description.tool.SourceEdgeViewCreationVariable newSourceViewVariable) {
+    public void setSourceViewVariable(SourceEdgeViewCreationVariable newSourceViewVariable) {
         if (newSourceViewVariable != sourceViewVariable) {
             NotificationChain msgs = null;
             if (sourceViewVariable != null)
@@ -733,10 +738,10 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl
      * 
      * @generated
      */
-    public org.eclipse.sirius.diagram.description.tool.TargetEdgeViewCreationVariable getTargetViewVariable() {
+    public TargetEdgeViewCreationVariable getTargetViewVariable() {
         if (targetViewVariable != null && targetViewVariable.eIsProxy()) {
             InternalEObject oldTargetViewVariable = (InternalEObject) targetViewVariable;
-            targetViewVariable = (org.eclipse.sirius.diagram.description.tool.TargetEdgeViewCreationVariable) eResolveProxy(oldTargetViewVariable);
+            targetViewVariable = (TargetEdgeViewCreationVariable) eResolveProxy(oldTargetViewVariable);
             if (targetViewVariable != oldTargetViewVariable) {
                 InternalEObject newTargetViewVariable = (InternalEObject) targetViewVariable;
                 NotificationChain msgs = oldTargetViewVariable.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ToolPackage.MESSAGE_CREATION_TOOL__TARGET_VIEW_VARIABLE, null, null);
@@ -757,7 +762,7 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl
      * 
      * @generated
      */
-    public org.eclipse.sirius.diagram.description.tool.TargetEdgeViewCreationVariable basicGetTargetViewVariable() {
+    public TargetEdgeViewCreationVariable basicGetTargetViewVariable() {
         return targetViewVariable;
     }
 
@@ -766,8 +771,8 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl
      * 
      * @generated
      */
-    public NotificationChain basicSetTargetViewVariable(org.eclipse.sirius.diagram.description.tool.TargetEdgeViewCreationVariable newTargetViewVariable, NotificationChain msgs) {
-        org.eclipse.sirius.diagram.description.tool.TargetEdgeViewCreationVariable oldTargetViewVariable = targetViewVariable;
+    public NotificationChain basicSetTargetViewVariable(TargetEdgeViewCreationVariable newTargetViewVariable, NotificationChain msgs) {
+        TargetEdgeViewCreationVariable oldTargetViewVariable = targetViewVariable;
         targetViewVariable = newTargetViewVariable;
         if (eNotificationRequired()) {
             ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ToolPackage.MESSAGE_CREATION_TOOL__TARGET_VIEW_VARIABLE, oldTargetViewVariable, newTargetViewVariable);
@@ -784,7 +789,7 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl
      * 
      * @generated
      */
-    public void setTargetViewVariable(org.eclipse.sirius.diagram.description.tool.TargetEdgeViewCreationVariable newTargetViewVariable) {
+    public void setTargetViewVariable(TargetEdgeViewCreationVariable newTargetViewVariable) {
         if (newTargetViewVariable != targetViewVariable) {
             NotificationChain msgs = null;
             if (targetViewVariable != null)
@@ -1158,16 +1163,16 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl
             getEdgeMappings().addAll((Collection<? extends EdgeMapping>) newValue);
             return;
         case ToolPackage.MESSAGE_CREATION_TOOL__SOURCE_VARIABLE:
-            setSourceVariable((org.eclipse.sirius.diagram.description.tool.SourceEdgeCreationVariable) newValue);
+            setSourceVariable((SourceEdgeCreationVariable) newValue);
             return;
         case ToolPackage.MESSAGE_CREATION_TOOL__TARGET_VARIABLE:
-            setTargetVariable((org.eclipse.sirius.diagram.description.tool.TargetEdgeCreationVariable) newValue);
+            setTargetVariable((TargetEdgeCreationVariable) newValue);
             return;
         case ToolPackage.MESSAGE_CREATION_TOOL__SOURCE_VIEW_VARIABLE:
-            setSourceViewVariable((org.eclipse.sirius.diagram.description.tool.SourceEdgeViewCreationVariable) newValue);
+            setSourceViewVariable((SourceEdgeViewCreationVariable) newValue);
             return;
         case ToolPackage.MESSAGE_CREATION_TOOL__TARGET_VIEW_VARIABLE:
-            setTargetViewVariable((org.eclipse.sirius.diagram.description.tool.TargetEdgeViewCreationVariable) newValue);
+            setTargetViewVariable((TargetEdgeViewCreationVariable) newValue);
             return;
         case ToolPackage.MESSAGE_CREATION_TOOL__INITIAL_OPERATION:
             setInitialOperation((InitEdgeCreationOperation) newValue);
@@ -1226,16 +1231,16 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl
             getEdgeMappings().clear();
             return;
         case ToolPackage.MESSAGE_CREATION_TOOL__SOURCE_VARIABLE:
-            setSourceVariable((org.eclipse.sirius.diagram.description.tool.SourceEdgeCreationVariable) null);
+            setSourceVariable((SourceEdgeCreationVariable) null);
             return;
         case ToolPackage.MESSAGE_CREATION_TOOL__TARGET_VARIABLE:
-            setTargetVariable((org.eclipse.sirius.diagram.description.tool.TargetEdgeCreationVariable) null);
+            setTargetVariable((TargetEdgeCreationVariable) null);
             return;
         case ToolPackage.MESSAGE_CREATION_TOOL__SOURCE_VIEW_VARIABLE:
-            setSourceViewVariable((org.eclipse.sirius.diagram.description.tool.SourceEdgeViewCreationVariable) null);
+            setSourceViewVariable((SourceEdgeViewCreationVariable) null);
             return;
         case ToolPackage.MESSAGE_CREATION_TOOL__TARGET_VIEW_VARIABLE:
-            setTargetViewVariable((org.eclipse.sirius.diagram.description.tool.TargetEdgeViewCreationVariable) null);
+            setTargetViewVariable((TargetEdgeViewCreationVariable) null);
             return;
         case ToolPackage.MESSAGE_CREATION_TOOL__INITIAL_OPERATION:
             setInitialOperation((InitEdgeCreationOperation) null);
@@ -1359,7 +1364,7 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl
                 return -1;
             }
         }
-        if (baseClass == org.eclipse.sirius.diagram.description.tool.EdgeCreationDescription.class) {
+        if (baseClass == EdgeCreationDescription.class) {
             switch (derivedFeatureID) {
             case ToolPackage.MESSAGE_CREATION_TOOL__EDGE_MAPPINGS:
                 return org.eclipse.sirius.diagram.description.tool.ToolPackage.EDGE_CREATION_DESCRIPTION__EDGE_MAPPINGS;
@@ -1447,7 +1452,7 @@ public class MessageCreationToolImpl extends SequenceDiagramToolDescriptionImpl
                 return -1;
             }
         }
-        if (baseClass == org.eclipse.sirius.diagram.description.tool.EdgeCreationDescription.class) {
+        if (baseClass == EdgeCreationDescription.class) {
             switch (baseFeatureID) {
             case org.eclipse.sirius.diagram.description.tool.ToolPackage.EDGE_CREATION_DESCRIPTION__EDGE_MAPPINGS:
                 return ToolPackage.MESSAGE_CREATION_TOOL__EDGE_MAPPINGS;
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/ObservationPointCreationToolImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/ObservationPointCreationToolImpl.java
index 5e9d485f3a..f1071b5f49 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/ObservationPointCreationToolImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/ObservationPointCreationToolImpl.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.sirius.diagram.description.tool.impl.NodeCreationDescriptionImpl;
 import org.eclipse.sirius.diagram.sequence.description.MessageEndVariable;
 import org.eclipse.sirius.diagram.sequence.description.tool.ObservationPointCreationTool;
 import org.eclipse.sirius.diagram.sequence.description.tool.OrderedElementCreationTool;
@@ -38,7 +39,7 @@ import org.eclipse.sirius.diagram.sequence.description.tool.ToolPackage;
  * 
  * @generated
  */
-public class ObservationPointCreationToolImpl extends org.eclipse.sirius.diagram.description.tool.impl.NodeCreationDescriptionImpl implements ObservationPointCreationTool {
+public class ObservationPointCreationToolImpl extends NodeCreationDescriptionImpl implements ObservationPointCreationTool {
     /**
      * The cached value of the '{@link #getStartingEndPredecessor()
      * <em>Starting End Predecessor</em>}' containment reference. <!--
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/OperandCreationToolImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/OperandCreationToolImpl.java
index 659c088917..4eda56c562 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/OperandCreationToolImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/OperandCreationToolImpl.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.sirius.diagram.description.tool.impl.ContainerCreationDescriptionImpl;
 import org.eclipse.sirius.diagram.sequence.description.MessageEndVariable;
 import org.eclipse.sirius.diagram.sequence.description.tool.OperandCreationTool;
 import org.eclipse.sirius.diagram.sequence.description.tool.OrderedElementCreationTool;
@@ -38,7 +39,7 @@ import org.eclipse.sirius.diagram.sequence.description.tool.ToolPackage;
  * 
  * @generated
  */
-public class OperandCreationToolImpl extends org.eclipse.sirius.diagram.description.tool.impl.ContainerCreationDescriptionImpl implements OperandCreationTool {
+public class OperandCreationToolImpl extends ContainerCreationDescriptionImpl implements OperandCreationTool {
     /**
      * The cached value of the '{@link #getStartingEndPredecessor()
      * <em>Starting End Predecessor</em>}' containment reference. <!--
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/StateCreationToolImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/StateCreationToolImpl.java
index a495bbb3b5..4a62cda1b5 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/StateCreationToolImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/StateCreationToolImpl.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.sirius.diagram.description.tool.impl.NodeCreationDescriptionImpl;
 import org.eclipse.sirius.diagram.sequence.description.MessageEndVariable;
 import org.eclipse.sirius.diagram.sequence.description.tool.OrderedElementCreationTool;
 import org.eclipse.sirius.diagram.sequence.description.tool.SequenceDiagramToolDescription;
@@ -38,7 +39,7 @@ import org.eclipse.sirius.diagram.sequence.description.tool.ToolPackage;
  * 
  * @generated
  */
-public class StateCreationToolImpl extends org.eclipse.sirius.diagram.description.tool.impl.NodeCreationDescriptionImpl implements StateCreationTool {
+public class StateCreationToolImpl extends NodeCreationDescriptionImpl implements StateCreationTool {
     /**
      * The cached value of the '{@link #getStartingEndPredecessor()
      * <em>Starting End Predecessor</em>}' containment reference. <!--
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/ToolPackageImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/ToolPackageImpl.java
index 162bff7024..9482828f4b 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/ToolPackageImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/impl/ToolPackageImpl.java
@@ -14,6 +14,7 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
+import org.eclipse.sirius.diagram.DiagramPackage;
 import org.eclipse.sirius.diagram.sequence.SequencePackage;
 import org.eclipse.sirius.diagram.sequence.description.DescriptionPackage;
 import org.eclipse.sirius.diagram.sequence.description.impl.DescriptionPackageImpl;
@@ -197,6 +198,7 @@ public class ToolPackageImpl extends EPackageImpl implements ToolPackage {
 
         // Initialize simple dependencies
         ViewpointPackage.eINSTANCE.eClass();
+        DiagramPackage.eINSTANCE.eClass();
 
         // Obtain or create and register interdependencies
         SequencePackageImpl theSequencePackage = (SequencePackageImpl) (EPackage.Registry.INSTANCE.getEPackage(SequencePackage.eNS_URI) instanceof SequencePackageImpl ? EPackage.Registry.INSTANCE
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/util/ToolAdapterFactory.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/util/ToolAdapterFactory.java
index 2aafc04f51..e70a014082 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/util/ToolAdapterFactory.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/util/ToolAdapterFactory.java
@@ -14,6 +14,9 @@ import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.sirius.diagram.description.tool.ContainerCreationDescription;
+import org.eclipse.sirius.diagram.description.tool.EdgeCreationDescription;
+import org.eclipse.sirius.diagram.description.tool.NodeCreationDescription;
 import org.eclipse.sirius.diagram.sequence.description.tool.CombinedFragmentCreationTool;
 import org.eclipse.sirius.diagram.sequence.description.tool.CoveringElementCreationTool;
 import org.eclipse.sirius.diagram.sequence.description.tool.ExecutionCreationTool;
@@ -186,17 +189,17 @@ public class ToolAdapterFactory extends AdapterFactoryImpl {
         }
 
         @Override
-        public Adapter caseNodeCreationDescription(org.eclipse.sirius.diagram.description.tool.NodeCreationDescription object) {
+        public Adapter caseNodeCreationDescription(NodeCreationDescription object) {
             return createNodeCreationDescriptionAdapter();
         }
 
         @Override
-        public Adapter caseContainerCreationDescription(org.eclipse.sirius.diagram.description.tool.ContainerCreationDescription object) {
+        public Adapter caseContainerCreationDescription(ContainerCreationDescription object) {
             return createContainerCreationDescriptionAdapter();
         }
 
         @Override
-        public Adapter caseEdgeCreationDescription(org.eclipse.sirius.diagram.description.tool.EdgeCreationDescription object) {
+        public Adapter caseEdgeCreationDescription(EdgeCreationDescription object) {
             return createEdgeCreationDescriptionAdapter();
         }
 
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/util/ToolSwitch.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/util/ToolSwitch.java
index 0a9ba8a67a..a89456b62b 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/util/ToolSwitch.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/tool/util/ToolSwitch.java
@@ -14,6 +14,9 @@ import java.util.List;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.sirius.diagram.description.tool.ContainerCreationDescription;
+import org.eclipse.sirius.diagram.description.tool.EdgeCreationDescription;
+import org.eclipse.sirius.diagram.description.tool.NodeCreationDescription;
 import org.eclipse.sirius.diagram.sequence.description.tool.CombinedFragmentCreationTool;
 import org.eclipse.sirius.diagram.sequence.description.tool.CoveringElementCreationTool;
 import org.eclipse.sirius.diagram.sequence.description.tool.ExecutionCreationTool;
@@ -711,7 +714,7 @@ public class ToolSwitch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseNodeCreationDescription(org.eclipse.sirius.diagram.description.tool.NodeCreationDescription object) {
+    public T caseNodeCreationDescription(NodeCreationDescription object) {
         return null;
     }
 
@@ -728,7 +731,7 @@ public class ToolSwitch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseContainerCreationDescription(org.eclipse.sirius.diagram.description.tool.ContainerCreationDescription object) {
+    public T caseContainerCreationDescription(ContainerCreationDescription object) {
         return null;
     }
 
@@ -745,7 +748,7 @@ public class ToolSwitch<T> {
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
-    public T caseEdgeCreationDescription(org.eclipse.sirius.diagram.description.tool.EdgeCreationDescription object) {
+    public T caseEdgeCreationDescription(EdgeCreationDescription object) {
         return null;
     }
 
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/util/DescriptionAdapterFactory.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/util/DescriptionAdapterFactory.java
index 7864873cdd..8090d344aa 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/util/DescriptionAdapterFactory.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/util/DescriptionAdapterFactory.java
@@ -18,6 +18,7 @@ import org.eclipse.sirius.diagram.description.AbstractNodeMapping;
 import org.eclipse.sirius.diagram.description.ContainerMapping;
 import org.eclipse.sirius.diagram.description.DiagramDescription;
 import org.eclipse.sirius.diagram.description.DiagramElementMapping;
+import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription;
 import org.eclipse.sirius.diagram.description.EdgeMapping;
 import org.eclipse.sirius.diagram.description.IEdgeMapping;
 import org.eclipse.sirius.diagram.description.NodeMapping;
@@ -42,7 +43,6 @@ import org.eclipse.sirius.diagram.sequence.description.ReturnMessageMapping;
 import org.eclipse.sirius.diagram.sequence.description.SequenceDiagramDescription;
 import org.eclipse.sirius.diagram.sequence.description.StateMapping;
 import org.eclipse.sirius.viewpoint.description.DocumentedElement;
-import org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription;
 import org.eclipse.sirius.viewpoint.description.EndUserDocumentedElement;
 import org.eclipse.sirius.viewpoint.description.IdentifiedElement;
 import org.eclipse.sirius.viewpoint.description.PasteTargetDescription;
@@ -649,14 +649,14 @@ public class DescriptionAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Creates a new adapter for an object of class '
-     * {@link org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription
+     * {@link org.eclipse.sirius.diagram.description.DragAndDropTargetDescription
      * <em>Drag And Drop Target Description</em>}'. <!-- begin-user-doc --> This
      * default implementation returns null so that we can easily ignore cases;
      * it's useful to ignore a case when inheritance will catch all the cases
      * anyway. <!-- end-user-doc -->
      * 
      * @return the new adapter.
-     * @see org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription
+     * @see org.eclipse.sirius.diagram.description.DragAndDropTargetDescription
      * @generated
      */
     public Adapter createDragAndDropTargetDescriptionAdapter() {
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/util/DescriptionSwitch.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/util/DescriptionSwitch.java
index 7d7dcb8ec3..437aa0c089 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/util/DescriptionSwitch.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/util/DescriptionSwitch.java
@@ -18,6 +18,7 @@ import org.eclipse.sirius.diagram.description.AbstractNodeMapping;
 import org.eclipse.sirius.diagram.description.ContainerMapping;
 import org.eclipse.sirius.diagram.description.DiagramDescription;
 import org.eclipse.sirius.diagram.description.DiagramElementMapping;
+import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription;
 import org.eclipse.sirius.diagram.description.EdgeMapping;
 import org.eclipse.sirius.diagram.description.IEdgeMapping;
 import org.eclipse.sirius.diagram.description.NodeMapping;
@@ -42,7 +43,6 @@ import org.eclipse.sirius.diagram.sequence.description.ReturnMessageMapping;
 import org.eclipse.sirius.diagram.sequence.description.SequenceDiagramDescription;
 import org.eclipse.sirius.diagram.sequence.description.StateMapping;
 import org.eclipse.sirius.viewpoint.description.DocumentedElement;
-import org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription;
 import org.eclipse.sirius.viewpoint.description.EndUserDocumentedElement;
 import org.eclipse.sirius.viewpoint.description.IdentifiedElement;
 import org.eclipse.sirius.viewpoint.description.PasteTargetDescription;
@@ -866,6 +866,23 @@ public class DescriptionSwitch<T> {
 
     /**
      * Returns the result of interpreting the object as an instance of '
+     * <em>Drag And Drop Target Description</em>'. <!-- begin-user-doc --> This
+     * implementation returns null; returning a non-null result will terminate
+     * the switch. <!-- end-user-doc -->
+     * 
+     * @param object
+     *            the target of the switch.
+     * @return the result of interpreting the object as an instance of '
+     *         <em>Drag And Drop Target Description</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseDragAndDropTargetDescription(DragAndDropTargetDescription object) {
+        return null;
+    }
+
+    /**
+     * Returns the result of interpreting the object as an instance of '
      * <em>Documented Element</em>'. <!-- begin-user-doc --> This implementation
      * returns null; returning a non-null result will terminate the switch. <!--
      * end-user-doc -->
@@ -917,23 +934,6 @@ public class DescriptionSwitch<T> {
 
     /**
      * Returns the result of interpreting the object as an instance of '
-     * <em>Drag And Drop Target Description</em>'. <!-- begin-user-doc --> This
-     * implementation returns null; returning a non-null result will terminate
-     * the switch. <!-- end-user-doc -->
-     * 
-     * @param object
-     *            the target of the switch.
-     * @return the result of interpreting the object as an instance of '
-     *         <em>Drag And Drop Target Description</em>'.
-     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-     * @generated
-     */
-    public T caseDragAndDropTargetDescription(DragAndDropTargetDescription object) {
-        return null;
-    }
-
-    /**
-     * Returns the result of interpreting the object as an instance of '
      * <em>Representation Description</em>'. <!-- begin-user-doc --> This
      * implementation returns null; returning a non-null result will terminate
      * the switch. <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/impl/SequencePackageImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/impl/SequencePackageImpl.java
index b33fc58e32..f31b38da32 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/impl/SequencePackageImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/impl/SequencePackageImpl.java
@@ -95,6 +95,7 @@ public class SequencePackageImpl extends EPackageImpl implements SequencePackage
 
         // Initialize simple dependencies
         ViewpointPackage.eINSTANCE.eClass();
+        DiagramPackage.eINSTANCE.eClass();
 
         // Obtain or create and register interdependencies
         DescriptionPackageImpl theDescriptionPackage = (DescriptionPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(DescriptionPackage.eNS_URI) instanceof DescriptionPackageImpl ? EPackage.Registry.INSTANCE
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/ordering/impl/OrderingPackageImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/ordering/impl/OrderingPackageImpl.java
index ad40cec26b..2f5cd08235 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/ordering/impl/OrderingPackageImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/ordering/impl/OrderingPackageImpl.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
+import org.eclipse.sirius.diagram.DiagramPackage;
 import org.eclipse.sirius.diagram.sequence.SequencePackage;
 import org.eclipse.sirius.diagram.sequence.description.DescriptionPackage;
 import org.eclipse.sirius.diagram.sequence.description.impl.DescriptionPackageImpl;
@@ -128,6 +129,7 @@ public class OrderingPackageImpl extends EPackageImpl implements OrderingPackage
 
         // Initialize simple dependencies
         ViewpointPackage.eINSTANCE.eClass();
+        DiagramPackage.eINSTANCE.eClass();
 
         // Obtain or create and register interdependencies
         SequencePackageImpl theSequencePackage = (SequencePackageImpl) (EPackage.Registry.INSTANCE.getEPackage(SequencePackage.eNS_URI) instanceof SequencePackageImpl ? EPackage.Registry.INSTANCE
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TemplatePackageImpl.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TemplatePackageImpl.java
index 1a3e0262b0..98cfffa14b 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TemplatePackageImpl.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/template/impl/TemplatePackageImpl.java
@@ -234,6 +234,7 @@ public class TemplatePackageImpl extends EPackageImpl implements TemplatePackage
 
         // Initialize simple dependencies
         ViewpointPackage.eINSTANCE.eClass();
+        DiagramPackage.eINSTANCE.eClass();
 
         // Obtain or create and register interdependencies
         SequencePackageImpl theSequencePackage = (SequencePackageImpl) (EPackage.Registry.INSTANCE.getEPackage(SequencePackage.eNS_URI) instanceof SequencePackageImpl ? EPackage.Registry.INSTANCE
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/util/SequenceAdapterFactory.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/util/SequenceAdapterFactory.java
index 39b5a25173..7668d6d3f7 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/util/SequenceAdapterFactory.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/util/SequenceAdapterFactory.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.sirius.diagram.DDiagram;
 import org.eclipse.sirius.diagram.DSemanticDiagram;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.sequence.SequenceDDiagram;
 import org.eclipse.sirius.diagram.sequence.SequencePackage;
 import org.eclipse.sirius.viewpoint.DContainer;
@@ -23,7 +24,6 @@ import org.eclipse.sirius.viewpoint.DRefreshable;
 import org.eclipse.sirius.viewpoint.DRepresentation;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
 import org.eclipse.sirius.viewpoint.DValidable;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
 import org.eclipse.sirius.viewpoint.description.DModelElement;
 import org.eclipse.sirius.viewpoint.description.DocumentedElement;
 
@@ -238,14 +238,14 @@ public class SequenceAdapterFactory extends AdapterFactoryImpl {
 
     /**
      * Creates a new adapter for an object of class '
-     * {@link org.eclipse.sirius.viewpoint.DragAndDropTarget
+     * {@link org.eclipse.sirius.diagram.DragAndDropTarget
      * <em>Drag And Drop Target</em>}'. <!-- begin-user-doc --> This default
      * implementation returns null so that we can easily ignore cases; it's
      * useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
      * 
      * @return the new adapter.
-     * @see org.eclipse.sirius.viewpoint.DragAndDropTarget
+     * @see org.eclipse.sirius.diagram.DragAndDropTarget
      * @generated
      */
     public Adapter createDragAndDropTargetAdapter() {
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/util/SequenceSwitch.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/util/SequenceSwitch.java
index ff5b7e093d..3c16d07a5b 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/util/SequenceSwitch.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/util/SequenceSwitch.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.sirius.diagram.DDiagram;
 import org.eclipse.sirius.diagram.DSemanticDiagram;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.sequence.SequenceDDiagram;
 import org.eclipse.sirius.diagram.sequence.SequencePackage;
 import org.eclipse.sirius.viewpoint.DContainer;
@@ -23,7 +24,6 @@ import org.eclipse.sirius.viewpoint.DRefreshable;
 import org.eclipse.sirius.viewpoint.DRepresentation;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
 import org.eclipse.sirius.viewpoint.DValidable;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
 import org.eclipse.sirius.viewpoint.description.DModelElement;
 import org.eclipse.sirius.viewpoint.description.DocumentedElement;
 
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/SequenceDDiagramSpec.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/SequenceDDiagramSpec.java
index bee9694a4c..0866273ba8 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/SequenceDDiagramSpec.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/SequenceDDiagramSpec.java
@@ -29,6 +29,7 @@ import org.eclipse.sirius.diagram.DNode;
 import org.eclipse.sirius.diagram.DNodeListElement;
 import org.eclipse.sirius.diagram.DiagramPackage;
 import org.eclipse.sirius.diagram.description.ContainerMapping;
+import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription;
 import org.eclipse.sirius.diagram.description.EdgeMapping;
 import org.eclipse.sirius.diagram.description.NodeMapping;
 import org.eclipse.sirius.diagram.description.concern.ConcernDescription;
@@ -37,7 +38,6 @@ import org.eclipse.sirius.diagram.sequence.impl.SequenceDDiagramImpl;
 import org.eclipse.sirius.viewpoint.DRepresentationElement;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
 import org.eclipse.sirius.viewpoint.description.DAnnotation;
-import org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription;
 
 /**
  * Implementation of <code>SequenceDDiagram</code>.