Bug 536632: [Sequence Diagram] Create the edit parts & basic figure for

DurationConstraint/DurationObservation
https://bugs.eclipse.org/bugs/show_bug.cgi?id=536632

- Support creation of DurationConstraint as Link
- Support creation of DurationObservation as Link

Change-Id: I21fedd133f2353e7f663b032ec32a07034e6f6cc
Signed-off-by: Camille Letavernier <cletavernier@eclipsesource.com>

22 files changed, 1400 insertions, 242 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/.options b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/.options
index df059bd75ab..6b00f7152df 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/.options
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/.options
@@ -5,6 +5,3 @@ org.eclipse.papyrus.uml.diagram.sequence/debug=false
 
 # Visual IDs
 org.eclipse.papyrus.uml.diagram.sequence/debug/visualID=false
-org.eclipse.papyrus.uml.diagram.sequence/debug/SequenceDebug=false
-org.eclipse.papyrus.uml.diagram.sequence/debug/SequenceDebugGrid=false
-org.eclipse.papyrus.uml.diagram.sequence/debug/SequenceDebugUtil=false
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/DurationLinkFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/DurationLinkFigure.java
new file mode 100644
index 00000000000..9bcf9fb6c8f
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/DurationLinkFigure.java
@@ -0,0 +1,20 @@
+/*****************************************************************************
+ * Copyright (c) 2018 CEA LIST, EclipseSource and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   EclipseSource - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.sequence.figures;
+
+import org.eclipse.papyrus.uml.diagram.common.figure.edge.UMLEdgeFigure;
+
+public class DurationLinkFigure extends UMLEdgeFigure {
+
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/PapyrusUMLSequenceDiagram.paletteconfiguration b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/PapyrusUMLSequenceDiagram.paletteconfiguration
index f2db127863a..faa1eb11242 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/PapyrusUMLSequenceDiagram.paletteconfiguration
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/PapyrusUMLSequenceDiagram.paletteconfiguration
@@ -56,12 +56,6 @@
         <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_Shape"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createDurationObservation11CreationTool" label="Duration Observation" description="Create a Duration Observation on a Message" kind="CreationTool">
-      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationObservation.gif"/>
-      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
-        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DurationObservation_Shape"/>
-      </elementDescriptors>
-    </ownedConfigurations>
     <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createTimeConstraint12CreationTool" label="Time Constraint" description="Create a Time Constraint" kind="CreationTool">
       <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeConstraint.gif"/>
       <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
@@ -74,15 +68,6 @@
         <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.TimeObservation_Shape"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createDurationConstraint14CreationTool" label="Duration Constraint" description="Create a Duration Constraint" kind="CreationTool">
-      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationConstraint.gif"/>
-      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
-        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DurationConstraint_Shape"/>
-      </elementDescriptors>
-      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
-        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DurationConstraint_Shape_CN"/>
-      </elementDescriptors>
-    </ownedConfigurations>
     <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createNEWGateCreationTool" label="Gate" description="New create a gate" kind="CreationTool">
       <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Gate.gif"/>
       <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
@@ -164,5 +149,17 @@
         <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_ContextEdge"/>
       </elementDescriptors>
     </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createDurationConstraintEdgeTool" label="Duration Constraint" description="Create a Duration Constraint between two elements" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationConstraint.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_zZRfUH3REeiyRednYY2ROQ"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createDurationObservationEdgeTool" label="Duration Observation" description="Create a Duration Observation between two elements" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationObservation.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#__qpi0H38EeiKffoiPArZXg"/>
+      </elementDescriptors>
+    </ownedConfigurations>
   </drawerConfigurations>
 </paletteconfiguration:PaletteConfiguration>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/sequenceDiagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/sequenceDiagram.gmfgen
index df5ec207d2b..d1a625dd4b5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/sequenceDiagram.gmfgen
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/sequenceDiagram.gmfgen
@@ -37,7 +37,7 @@
             xsi:type="gmfgen:GenDomainElementTarget"
             contextSelector="/0/@audits/@clientContexts.0">
           <element
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction"/>
         </target>
       </rules>
       <rules
@@ -52,7 +52,7 @@
             xsi:type="gmfgen:GenDomainElementTarget"
             contextSelector="/0/@audits/@clientContexts.0">
           <element
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InteractionOperand"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InteractionOperand"/>
         </target>
       </rules>
       <rules
@@ -85,7 +85,7 @@
         validationDecorators="true"
         liveValidationUIFeedback="true">
       <diagramRunTimeClass
-          href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Diagram"/>
+          href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Diagram"/>
       <elementType
           xsi:type="gmfgen:MetamodelType"
           uniqueIdentifier="org.eclipse.papyrus.umldi.Package_SequenceDiagram"
@@ -107,7 +107,7 @@
           key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"
           editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.SequenceDiagramLayoutEditPolicy"/>
       <domainDiagramElement
-          href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package"/>
+          href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package"/>
       <childNodes
           visualID="3007"
           editPartClassName="ConsiderIgnoreFragmentEditPart"
@@ -118,7 +118,7 @@
           createCommandClassName="ConsiderIgnoreFragmentCreateCommand"
           containers="/0/@diagram/@compartments.0 /0/@diagram/@childNodes.2">
         <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+            href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType
             xsi:type="gmfgen:MetamodelType"
             uniqueIdentifier="org.eclipse.papyrus.umldi.ConsiderIgnoreFragment_Shape"
@@ -133,18 +133,18 @@
             editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>
         <modelFacet>
           <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ConsiderIgnoreFragment"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ConsiderIgnoreFragment"/>
           <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/fragment"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/fragment"/>
           <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/fragment"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/fragment"/>
           <modelElementInitializer
               xsi:type="gmfgen:GenFeatureSeqInitializer">
             <initializers
                 xsi:type="gmfgen:GenFeatureValueSpec"
                 value="/0/@expressionProviders/@providers.0/@expressions.1">
               <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
+                  href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
             </initializers>
           </modelElementInitializer>
         </modelFacet>
@@ -161,7 +161,7 @@
           createCommandClassName="CombinedFragmentCreateCommand"
           containers="/0/@diagram/@childNodes.2 /0/@diagram/@compartments.0">
         <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+            href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType
             xsi:type="gmfgen:MetamodelType"
             uniqueIdentifier="org.eclipse.papyrus.umldi.CombinedFragment_Shape"
@@ -180,18 +180,18 @@
             editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CustomDiagramDragDropEditPolicy"/>
         <modelFacet>
           <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/CombinedFragment"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/CombinedFragment"/>
           <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/fragment"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/fragment"/>
           <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/fragment"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/fragment"/>
           <modelElementInitializer
               xsi:type="gmfgen:GenFeatureSeqInitializer">
             <initializers
                 xsi:type="gmfgen:GenFeatureValueSpec"
                 value="/0/@expressionProviders/@providers.0/@expressions.2">
               <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
+                  href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
             </initializers>
           </modelElementInitializer>
         </modelFacet>
@@ -207,7 +207,7 @@
           createCommandClassName="InteractionOperandCreateCommand"
           containers="/0/@diagram/@compartments.1">
         <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+            href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType
             xsi:type="gmfgen:MetamodelType"
             uniqueIdentifier="org.eclipse.papyrus.umldi.InteractionOperand_Shape"
@@ -234,11 +234,11 @@
             editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling.ConnectInteractionOperandToGridEditPolicy"/>
         <modelFacet>
           <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InteractionOperand"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InteractionOperand"/>
           <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/CombinedFragment/operand"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/CombinedFragment/operand"/>
           <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/CombinedFragment/operand"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/CombinedFragment/operand"/>
         </modelFacet>
       </childNodes>
       <childNodes
@@ -252,7 +252,7 @@
           createCommandClassName="InteractionUseCreateCommand"
           containers="/0/@diagram/@childNodes.2 /0/@diagram/@compartments.0">
         <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+            href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType
             xsi:type="gmfgen:MetamodelType"
             uniqueIdentifier="org.eclipse.papyrus.umldi.InteractionUse_Shape"
@@ -265,18 +265,18 @@
             xsi:type="gmfgen:OpenDiagramBehaviour"/>
         <modelFacet>
           <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InteractionUse"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InteractionUse"/>
           <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/fragment"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/fragment"/>
           <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/fragment"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/fragment"/>
           <modelElementInitializer
               xsi:type="gmfgen:GenFeatureSeqInitializer">
             <initializers
                 xsi:type="gmfgen:GenFeatureValueSpec"
                 value="/0/@expressionProviders/@providers.0/@expressions.3">
               <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
+                  href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
             </initializers>
           </modelElementInitializer>
         </modelFacet>
@@ -287,7 +287,7 @@
             notationViewFactoryClassName="InteractionUseNameViewFactory"
             readOnly="true">
           <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+              href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap
               xsi:type="gmfgen:ParentAssignedViewmap"
               getterName="getNameLabel"
@@ -299,7 +299,7 @@
               editorPattern=""
               editPattern="">
             <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
+                href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
           </modelFacet>
         </labels>
         <labels
@@ -309,7 +309,7 @@
             notationViewFactoryClassName="InteractionUseNameViewFactory"
             readOnly="true">
           <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+              href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap
               xsi:type="gmfgen:ParentAssignedViewmap"
               getterName="getCenterLabel"
@@ -320,7 +320,7 @@
               viewPattern=""
               editorPattern="">
             <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
+                href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
           </modelFacet>
         </labels>
       </childNodes>
@@ -335,7 +335,7 @@
           createCommandClassName="ContinuationCreateCommand"
           containers="/0/@diagram/@childNodes.2">
         <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+            href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType
             xsi:type="gmfgen:MetamodelType"
             uniqueIdentifier="org.eclipse.papyrus.umldi.Continuation_Shape"
@@ -346,18 +346,18 @@
             figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.figures.ContinuationFigure"/>
         <modelFacet>
           <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Continuation"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Continuation"/>
           <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InteractionOperand/fragment"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InteractionOperand/fragment"/>
           <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InteractionOperand/fragment"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InteractionOperand/fragment"/>
           <modelElementInitializer
               xsi:type="gmfgen:GenFeatureSeqInitializer">
             <initializers
                 xsi:type="gmfgen:GenFeatureValueSpec"
                 value="/0/@expressionProviders/@providers.0/@expressions.4">
               <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
+                  href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
             </initializers>
           </modelElementInitializer>
         </modelFacet>
@@ -368,7 +368,7 @@
             notationViewFactoryClassName="ContinuationNameViewFactory"
             elementIcon="true">
           <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+              href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap
               xsi:type="gmfgen:ParentAssignedViewmap"
               getterName="getFigureContinuationNameLabel"
@@ -378,7 +378,7 @@
               parser="/0/@labelParsers/@implementations.1"
               viewPattern="">
             <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
+                href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
           </modelFacet>
         </labels>
       </childNodes>
@@ -393,7 +393,7 @@
           createCommandClassName="LifelineCreateCommand"
           containers="/0/@diagram/@compartments.0">
         <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+            href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType
             xsi:type="gmfgen:MetamodelType"
             uniqueIdentifier="org.eclipse.papyrus.umldi.Lifeline_Shape"
@@ -437,18 +437,18 @@
             editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.LifeLineResizeAffixedNodeEditPolicy"/>
         <modelFacet>
           <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Lifeline"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Lifeline"/>
           <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/lifeline"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/lifeline"/>
           <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/lifeline"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/lifeline"/>
           <modelElementInitializer
               xsi:type="gmfgen:GenFeatureSeqInitializer">
             <initializers
                 xsi:type="gmfgen:GenFeatureValueSpec"
                 value="/0/@expressionProviders/@providers.0/@expressions.5">
               <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
+                  href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
             </initializers>
           </modelElementInitializer>
         </modelFacet>
@@ -458,7 +458,7 @@
             itemSemanticEditPolicyClassName="LifelineNameItemSemanticEditPolicy"
             notationViewFactoryClassName="LifelineNameViewFactory">
           <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+              href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap
               xsi:type="gmfgen:ParentAssignedViewmap"
               getterName="getFigureLifelineLabelFigure"
@@ -470,7 +470,7 @@
               editorPattern="{0}"
               editPattern="{0}">
             <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
+                href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
           </modelFacet>
         </labels>
       </childNodes>
@@ -484,7 +484,7 @@
           createCommandClassName="ActionExecutionSpecificationCreateCommand"
           containers="/0/@diagram/@childNodes.5">
         <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+            href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType
             xsi:type="gmfgen:MetamodelType"
             uniqueIdentifier="org.eclipse.papyrus.umldi.ActionExecutionSpecification_Shape"
@@ -511,11 +511,11 @@
             editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.ExecutionSpecificationComponentEditPolicy"/>
         <modelFacet>
           <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ActionExecutionSpecification"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/ActionExecutionSpecification"/>
           <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/fragment"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/fragment"/>
           <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/fragment"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/fragment"/>
         </modelFacet>
       </childNodes>
       <childNodes
@@ -528,7 +528,7 @@
           createCommandClassName="BehaviorExecutionSpecificationCreateCommand"
           containers="/0/@diagram/@childNodes.5">
         <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+            href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType
             xsi:type="gmfgen:MetamodelType"
             uniqueIdentifier="org.eclipse.papyrus.umldi.BehaviorExecutionSpecification_Shape"
@@ -555,11 +555,11 @@
             editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.ExecutionSpecificationComponentEditPolicy"/>
         <modelFacet>
           <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/BehaviorExecutionSpecification"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/BehaviorExecutionSpecification"/>
           <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/fragment"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/fragment"/>
           <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/fragment"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/fragment"/>
         </modelFacet>
       </childNodes>
       <childNodes
@@ -573,7 +573,7 @@
           createCommandClassName="StateInvariantCreateCommand"
           containers="/0/@diagram/@childNodes.5">
         <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+            href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType
             xsi:type="gmfgen:MetamodelType"
             uniqueIdentifier="org.eclipse.papyrus.umldi.StateInvariant_Shape"
@@ -584,18 +584,18 @@
             figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.figures.ContinuationFigure"/>
         <modelFacet>
           <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StateInvariant"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StateInvariant"/>
           <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/fragment"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/fragment"/>
           <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/fragment"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/fragment"/>
           <modelElementInitializer
               xsi:type="gmfgen:GenFeatureSeqInitializer">
             <initializers
                 xsi:type="gmfgen:GenFeatureValueSpec"
                 value="/0/@expressionProviders/@providers.0/@expressions.6">
               <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
+                  href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
             </initializers>
           </modelElementInitializer>
         </modelFacet>
@@ -606,7 +606,7 @@
             notationViewFactoryClassName="StateInvariantNameViewFactory"
             elementIcon="true">
           <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+              href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap
               xsi:type="gmfgen:ParentAssignedViewmap"
               getterName="getFigureContinuationNameLabel"
@@ -615,7 +615,7 @@
               xsi:type="gmfgen:FeatureLabelModelFacet"
               parser="/0/@labelParsers/@implementations.1">
             <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
+                href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
           </modelFacet>
         </labels>
         <labels
@@ -625,7 +625,7 @@
             notationViewFactoryClassName="StateInvariantLabelViewFactory"
             elementIcon="true">
           <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+              href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap
               xsi:type="gmfgen:ParentAssignedViewmap"
               getterName="getInvariantFigure"
@@ -645,7 +645,7 @@
           createCommandClassName="TimeConstraintCreateCommand"
           containers="/0/@diagram/@childNodes.5">
         <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+            href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType
             xsi:type="gmfgen:MetamodelType"
             uniqueIdentifier="org.eclipse.papyrus.umldi.TimeConstraint_Shape"
@@ -656,33 +656,33 @@
             figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.figures.TimeMarkElementFigure"/>
         <modelFacet>
           <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeConstraint"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeConstraint"/>
           <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>
           <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>
           <modelElementInitializer
               xsi:type="gmfgen:GenFeatureSeqInitializer">
             <initializers
                 xsi:type="gmfgen:GenReferenceNewElementSpec">
               <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
+                  href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
               <newElementInitializers>
                 <initializers
                     xsi:type="gmfgen:GenFeatureValueSpec"
                     value="/0/@expressionProviders/@providers.0/@expressions.8">
                   <feature
-                      href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
+                      href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
                 </initializers>
                 <elementClass
-                    href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeInterval"/>
+                    href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeInterval"/>
               </newElementInitializers>
             </initializers>
             <initializers
                 xsi:type="gmfgen:GenFeatureValueSpec"
                 value="/0/@expressionProviders/@providers.0/@expressions.9">
               <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
+                  href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
             </initializers>
           </modelElementInitializer>
         </modelFacet>
@@ -693,7 +693,7 @@
             itemSemanticEditPolicyClassName="TimeConstraintLabelItemSemanticEditPolicy"
             notationViewFactoryClassName="TimeConstraintLabelViewFactory">
           <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+              href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.figures.MultilineLabelFigure"/>
@@ -709,7 +709,7 @@
             readOnly="true"
             elementIcon="true">
           <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+              href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">
@@ -736,7 +736,7 @@
           createCommandClassName="TimeObservationCreateCommand"
           containers="/0/@diagram/@childNodes.5">
         <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+            href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType
             xsi:type="gmfgen:MetamodelType"
             uniqueIdentifier="org.eclipse.papyrus.umldi.TimeObservation_Shape"
@@ -751,18 +751,18 @@
             editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.DeleteTimeElementWithoutEventPolicy"/>
         <modelFacet>
           <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeObservation"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/TimeObservation"/>
           <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
           <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
           <modelElementInitializer
               xsi:type="gmfgen:GenFeatureSeqInitializer">
             <initializers
                 xsi:type="gmfgen:GenFeatureValueSpec"
                 value="/0/@expressionProviders/@providers.0/@expressions.10">
               <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
+                  href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
             </initializers>
           </modelElementInitializer>
         </modelFacet>
@@ -773,7 +773,7 @@
             itemSemanticEditPolicyClassName="TimeObservationLabelItemSemanticEditPolicy"
             notationViewFactoryClassName="TimeObservationLabelViewFactory">
           <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+              href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.figures.MultilineLabelFigure"/>
@@ -789,7 +789,7 @@
             readOnly="true"
             elementIcon="true">
           <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+              href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure">
@@ -817,7 +817,7 @@
           containers="/0/@diagram/@childNodes.5"
           preferredSideName="SOUTH">
         <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+            href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType
             xsi:type="gmfgen:MetamodelType"
             uniqueIdentifier="org.eclipse.papyrus.umldi.DestructionOccurrenceSpecification_Shape"
@@ -831,16 +831,16 @@
         </viewmap>
         <modelFacet>
           <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DestructionOccurrenceSpecification"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DestructionOccurrenceSpecification"/>
           <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/fragment"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/fragment"/>
           <modelElementInitializer
               xsi:type="gmfgen:GenFeatureSeqInitializer">
             <initializers
                 xsi:type="gmfgen:GenFeatureValueSpec"
                 value="/0/@expressionProviders/@providers.0/@expressions.13">
               <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
+                  href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
             </initializers>
           </modelElementInitializer>
         </modelFacet>
@@ -855,7 +855,7 @@
           createCommandClassName="ConstraintCreateCommand"
           containers="/0/@diagram/@compartments.0">
         <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+            href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType
             xsi:type="gmfgen:MetamodelType"
             uniqueIdentifier="org.eclipse.papyrus.umldi.Constraint_Shape"
@@ -870,26 +870,26 @@
             editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
         <modelFacet>
           <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint"/>
           <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>
           <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>
           <modelElementInitializer
               xsi:type="gmfgen:GenFeatureSeqInitializer">
             <initializers
                 xsi:type="gmfgen:GenReferenceNewElementSpec">
               <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
+                  href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/specification"/>
               <newElementInitializers>
                 <initializers
                     xsi:type="gmfgen:GenFeatureValueSpec"
                     value="/0/@expressionProviders/@providers.0/@expressions.14">
                   <feature
-                      href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/LiteralString/value"/>
+                      href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/LiteralString/value"/>
                 </initializers>
                 <elementClass
-                    href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/LiteralString"/>
+                    href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/LiteralString"/>
               </newElementInitializers>
             </initializers>
           </modelElementInitializer>
@@ -900,7 +900,7 @@
             itemSemanticEditPolicyClassName="ConstraintNameItemSemanticEditPolicy"
             notationViewFactoryClassName="ConstraintNameViewFactory">
           <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+              href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap
               xsi:type="gmfgen:ParentAssignedViewmap"
               getterName="getNameLabel"
@@ -910,7 +910,7 @@
               parser="/0/@labelParsers/@implementations.1"
               editPattern="">
             <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
+                href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
           </modelFacet>
         </labels>
         <labels
@@ -919,7 +919,7 @@
             itemSemanticEditPolicyClassName="Constraint2ItemSemanticEditPolicy"
             notationViewFactoryClassName="ConstraintLabelViewFactory">
           <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+              href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap
               xsi:type="gmfgen:ParentAssignedViewmap"
               getterName="getConstraintFigure"
@@ -938,7 +938,7 @@
           createCommandClassName="CommentCreateCommand"
           containers="/0/@diagram/@compartments.0">
         <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+            href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType
             xsi:type="gmfgen:MetamodelType"
             uniqueIdentifier="org.eclipse.papyrus.umldi.Comment_Shape"
@@ -961,18 +961,18 @@
             editPolicyQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusReflowableShapeEditPolicy"/>
         <modelFacet>
           <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment"/>
           <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedComment"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedComment"/>
           <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedComment"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedComment"/>
           <modelElementInitializer
               xsi:type="gmfgen:GenFeatureSeqInitializer">
             <initializers
                 xsi:type="gmfgen:GenFeatureValueSpec"
                 value="/0/@expressionProviders/@providers.1/@expressions.0">
               <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/body"/>
+                  href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/body"/>
             </initializers>
           </modelElementInitializer>
         </modelFacet>
@@ -982,7 +982,7 @@
             itemSemanticEditPolicyClassName="CommentBodyItemSemanticEditPolicy"
             notationViewFactoryClassName="CommentBodyViewFactory">
           <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+              href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap
               xsi:type="gmfgen:ParentAssignedViewmap"
               getterName="getCornerBentFigure"
@@ -992,7 +992,7 @@
               parser="/0/@labelParsers/@implementations.5"
               editPattern="">
             <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/body"/>
+                href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/body"/>
           </modelFacet>
         </labels>
       </childNodes>
@@ -1006,7 +1006,7 @@
           createCommandClassName="GateCreateCommand"
           containers="/0/@diagram/@childNodes.1 /0/@diagram/@childNodes.3 /0/@diagram/@topLevelNodes.0">
         <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+            href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType
             xsi:type="gmfgen:MetamodelType"
             uniqueIdentifier="org.eclipse.papyrus.umldi.Gate_Shape"
@@ -1027,18 +1027,18 @@
             editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.MaskManagedNodeEditPolicy"/>
         <modelFacet>
           <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Gate"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Gate"/>
           <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/formalGate"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/formalGate"/>
           <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/formalGate"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/formalGate"/>
         </modelFacet>
         <labels
             xsi:type="gmfgen:GenExternalNodeLabel"
             visualID="5024"
             elementIcon="true">
           <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+              href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap
               xsi:type="gmfgen:FigureViewmap"
               figureQualifiedClassName="org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel">
@@ -1051,7 +1051,7 @@
               xsi:type="gmfgen:FeatureLabelModelFacet"
               parser="/0/@labelParsers/@implementations.1">
             <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
+                href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
           </modelFacet>
         </labels>
       </childNodes>
@@ -1066,7 +1066,7 @@
           graphicalNodeEditPolicyClassName="InteractionGraphicalNodeEditPolicy"
           createCommandClassName="InteractionCreateCommand">
         <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+            href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType
             xsi:type="gmfgen:MetamodelType"
             uniqueIdentifier="org.eclipse.papyrus.umldi.Interaction_Shape"
@@ -1094,18 +1094,18 @@
             editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CustomDiagramDragDropEditPolicy"/>
         <modelFacet>
           <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction"/>
           <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
           <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
           <modelElementInitializer
               xsi:type="gmfgen:GenFeatureSeqInitializer">
             <initializers
                 xsi:type="gmfgen:GenFeatureValueSpec"
                 value="/0/@expressionProviders/@providers.0/@expressions.0">
               <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
+                  href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
             </initializers>
           </modelElementInitializer>
         </modelFacet>
@@ -1115,7 +1115,7 @@
             itemSemanticEditPolicyClassName="InteractionNameItemSemanticEditPolicy"
             notationViewFactoryClassName="InteractionNameViewFactory">
           <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+              href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap
               xsi:type="gmfgen:ParentAssignedViewmap"
               getterName="getNameLabel"
@@ -1127,7 +1127,7 @@
               editorPattern="{0}"
               editPattern="{0}">
             <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
+                href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
           </modelFacet>
         </labels>
       </topLevelNodes>
@@ -1139,7 +1139,7 @@
           createCommandClassName="MessageSyncCreateCommand"
           reorientCommandClassName="MessageSyncReorientCommand">
         <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
+            href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
         <elementType
             xsi:type="gmfgen:MetamodelType"
             uniqueIdentifier="org.eclipse.papyrus.umldi.Message_SynchEdge"
@@ -1164,15 +1164,15 @@
             xsi:type="gmfgen:TypeLinkModelFacet"
             modelElementSelector="/0/@expressionProviders/@providers.1/@expressions.1">
           <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Message"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Message"/>
           <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/message"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/message"/>
           <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/message"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/message"/>
           <sourceMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/owner"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/owner"/>
           <targetMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedElement"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedElement"/>
         </modelFacet>
         <labels
             visualID="6001"
@@ -1180,7 +1180,7 @@
             itemSemanticEditPolicyClassName="MessageSyncNameItemSemanticEditPolicy"
             notationViewFactoryClassName="MessageNameViewFactory">
           <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+              href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap
               xsi:type="gmfgen:ParentAssignedViewmap"
               getterName="getMessageLabelFigure"
@@ -1196,7 +1196,7 @@
               editorPattern=""
               editPattern="">
             <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
+                href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
           </modelFacet>
         </labels>
         <labels
@@ -1206,7 +1206,7 @@
             notationViewFactoryClassName="MessageLabelViewFactory"
             readOnly="true">
           <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+              href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap
               xsi:type="gmfgen:ParentAssignedViewmap"
               getterName="getAppliedStereotypeLabel"
@@ -1231,7 +1231,7 @@
           createCommandClassName="MessageAsyncCreateCommand"
           reorientCommandClassName="MessageAsyncReorientCommand">
         <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
+            href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
         <elementType
             xsi:type="gmfgen:MetamodelType"
             uniqueIdentifier="org.eclipse.papyrus.umldi.Message_AsynchEdge"
@@ -1256,15 +1256,15 @@
             xsi:type="gmfgen:TypeLinkModelFacet"
             modelElementSelector="/0/@expressionProviders/@providers.1/@expressions.4">
           <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Message"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Message"/>
           <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/message"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/message"/>
           <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/message"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/message"/>
           <sourceMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/owner"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/owner"/>
           <targetMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedElement"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedElement"/>
         </modelFacet>
         <labels
             visualID="6002"
@@ -1272,7 +1272,7 @@
             itemSemanticEditPolicyClassName="MessageAsyncNameItemSemanticEditPolicy"
             notationViewFactoryClassName="MessageNameViewFactory">
           <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+              href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap
               xsi:type="gmfgen:ParentAssignedViewmap"
               getterName="getMessageLabelFigure"
@@ -1287,7 +1287,7 @@
               parser="/0/@labelParsers/@implementations.4"
               editPattern="">
             <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
+                href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
           </modelFacet>
         </labels>
         <labels
@@ -1297,7 +1297,7 @@
             notationViewFactoryClassName="MessageLabelViewFactory"
             readOnly="true">
           <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+              href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap
               xsi:type="gmfgen:ParentAssignedViewmap"
               getterName="getAppliedStereotypeLabel"
@@ -1322,7 +1322,7 @@
           createCommandClassName="MessageReplyCreateCommand"
           reorientCommandClassName="MessageReplyReorientCommand">
         <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
+            href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
         <elementType
             xsi:type="gmfgen:SpecializationType"
             uniqueIdentifier="org.eclipse.papyrus.umldi.Message_ReplyEdge"
@@ -1347,15 +1347,15 @@
             xsi:type="gmfgen:TypeLinkModelFacet"
             modelElementSelector="/0/@expressionProviders/@providers.1/@expressions.7">
           <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Message"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Message"/>
           <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/message"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/message"/>
           <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/message"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/message"/>
           <sourceMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/owner"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/owner"/>
           <targetMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedElement"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedElement"/>
         </modelFacet>
         <labels
             visualID="6003"
@@ -1363,7 +1363,7 @@
             itemSemanticEditPolicyClassName="MessageReplyNameItemSemanticEditPolicy"
             notationViewFactoryClassName="MessageNameViewFactory">
           <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+              href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap
               xsi:type="gmfgen:ParentAssignedViewmap"
               getterName="getMessageLabelFigure"
@@ -1378,7 +1378,7 @@
               parser="/0/@labelParsers/@implementations.4"
               editPattern="">
             <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
+                href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
           </modelFacet>
         </labels>
         <labels
@@ -1388,7 +1388,7 @@
             notationViewFactoryClassName="MessageLabelViewFactory"
             readOnly="true">
           <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+              href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap
               xsi:type="gmfgen:ParentAssignedViewmap"
               getterName="getAppliedStereotypeLabel"
@@ -1413,7 +1413,7 @@
           createCommandClassName="MessageCreateCreateCommand"
           reorientCommandClassName="MessageCreateReorientCommand">
         <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
+            href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
         <elementType
             xsi:type="gmfgen:SpecializationType"
             uniqueIdentifier="org.eclipse.papyrus.umldi.Message_CreateEdge"
@@ -1438,15 +1438,15 @@
             xsi:type="gmfgen:TypeLinkModelFacet"
             modelElementSelector="/0/@expressionProviders/@providers.1/@expressions.10">
           <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Message"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Message"/>
           <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/message"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/message"/>
           <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/message"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/message"/>
           <sourceMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/owner"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/owner"/>
           <targetMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedElement"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedElement"/>
         </modelFacet>
         <labels
             visualID="6004"
@@ -1454,7 +1454,7 @@
             itemSemanticEditPolicyClassName="MessageCreateNameItemSemanticEditPolicy"
             notationViewFactoryClassName="MessageNameViewFactory">
           <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+              href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap
               xsi:type="gmfgen:ParentAssignedViewmap"
               getterName="getMessageLabelFigure"
@@ -1470,7 +1470,7 @@
               editorPattern=""
               editPattern="">
             <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
+                href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
           </modelFacet>
         </labels>
         <labels
@@ -1480,7 +1480,7 @@
             notationViewFactoryClassName="MessageLabelViewFactory"
             readOnly="true">
           <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+              href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap
               xsi:type="gmfgen:ParentAssignedViewmap"
               getterName="getAppliedStereotypeLabel"
@@ -1505,7 +1505,7 @@
           createCommandClassName="MessageDeleteCreateCommand"
           reorientCommandClassName="MessageDeleteReorientCommand">
         <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
+            href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
         <elementType
             xsi:type="gmfgen:SpecializationType"
             uniqueIdentifier="org.eclipse.papyrus.umldi.Message_DeleteEdge"
@@ -1530,15 +1530,15 @@
             xsi:type="gmfgen:TypeLinkModelFacet"
             modelElementSelector="/0/@expressionProviders/@providers.1/@expressions.13">
           <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Message"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Message"/>
           <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/message"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/message"/>
           <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/message"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/message"/>
           <sourceMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/owner"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/owner"/>
           <targetMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedElement"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedElement"/>
         </modelFacet>
         <labels
             visualID="6005"
@@ -1546,7 +1546,7 @@
             itemSemanticEditPolicyClassName="MessageDeleteNameItemSemanticEditPolicy"
             notationViewFactoryClassName="MessageNameViewFactory">
           <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+              href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap
               xsi:type="gmfgen:ParentAssignedViewmap"
               getterName="getMessageLabelFigure"
@@ -1561,7 +1561,7 @@
               parser="/0/@labelParsers/@implementations.4"
               editPattern="">
             <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
+                href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
           </modelFacet>
         </labels>
         <labels
@@ -1571,7 +1571,7 @@
             notationViewFactoryClassName="MessageLabelViewFactory"
             readOnly="true">
           <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+              href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap
               xsi:type="gmfgen:ParentAssignedViewmap"
               getterName="getAppliedStereotypeLabel"
@@ -1596,7 +1596,7 @@
           createCommandClassName="MessageLostCreateCommand"
           reorientCommandClassName="MessageLostReorientCommand">
         <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
+            href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
         <elementType
             xsi:type="gmfgen:SpecializationType"
             uniqueIdentifier="org.eclipse.papyrus.umldi.Message_LostEdge"
@@ -1621,15 +1621,15 @@
             xsi:type="gmfgen:TypeLinkModelFacet"
             modelElementSelector="/0/@expressionProviders/@providers.1/@expressions.16">
           <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Message"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Message"/>
           <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/message"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/message"/>
           <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/message"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/message"/>
           <sourceMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/owner"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/owner"/>
           <targetMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedElement"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedElement"/>
         </modelFacet>
         <labels
             visualID="6006"
@@ -1637,7 +1637,7 @@
             itemSemanticEditPolicyClassName="MessageLostNameItemSemanticEditPolicy"
             notationViewFactoryClassName="MessageNameViewFactory">
           <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+              href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap
               xsi:type="gmfgen:ParentAssignedViewmap"
               getterName="getMessageLabelFigure"
@@ -1653,7 +1653,7 @@
               editorPattern=""
               editPattern="">
             <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
+                href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
           </modelFacet>
         </labels>
         <labels
@@ -1663,7 +1663,7 @@
             notationViewFactoryClassName="MessageLabelViewFactory"
             readOnly="true">
           <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+              href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap
               xsi:type="gmfgen:ParentAssignedViewmap"
               getterName="getAppliedStereotypeLabel"
@@ -1688,7 +1688,7 @@
           createCommandClassName="MessageFoundCreateCommand"
           reorientCommandClassName="MessageFoundReorientCommand">
         <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
+            href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
         <elementType
             xsi:type="gmfgen:SpecializationType"
             uniqueIdentifier="org.eclipse.papyrus.umldi.Message_FoundEdge"
@@ -1713,15 +1713,15 @@
             xsi:type="gmfgen:TypeLinkModelFacet"
             modelElementSelector="/0/@expressionProviders/@providers.1/@expressions.19">
           <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Message"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Message"/>
           <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/message"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/message"/>
           <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/message"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Interaction/message"/>
           <sourceMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/owner"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/owner"/>
           <targetMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedElement"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Element/ownedElement"/>
         </modelFacet>
         <labels
             visualID="6007"
@@ -1729,7 +1729,7 @@
             itemSemanticEditPolicyClassName="MessageFoundNameItemSemanticEditPolicy"
             notationViewFactoryClassName="MessageNameViewFactory">
           <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+              href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap
               xsi:type="gmfgen:ParentAssignedViewmap"
               getterName="getMessageLabelFigure"
@@ -1744,7 +1744,7 @@
               parser="/0/@labelParsers/@implementations.4"
               editPattern="">
             <metaFeatures
-                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
+                href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
           </modelFacet>
         </labels>
         <labels
@@ -1754,7 +1754,7 @@
             notationViewFactoryClassName="MessageLabelViewFactory"
             readOnly="true">
           <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+              href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap
               xsi:type="gmfgen:ParentAssignedViewmap"
               getterName="getAppliedStereotypeLabel"
@@ -1779,7 +1779,7 @@
           createCommandClassName="CommentAnnotatedElementCreateCommand"
           reorientCommandClassName="CommentAnnotatedElementReorientCommand">
         <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
+            href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
         <elementType
             xsi:type="gmfgen:SpecializationType"
             uniqueIdentifier="org.eclipse.papyrus.umldi.Comment_AnnotatedElementEdge"
@@ -1790,7 +1790,7 @@
         <modelFacet
             xsi:type="gmfgen:FeatureLinkModelFacet">
           <metaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/annotatedElement"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/annotatedElement"/>
         </modelFacet>
       </links>
       <links
@@ -1801,7 +1801,7 @@
           createCommandClassName="ConstraintConstrainedElementCreateCommand"
           reorientCommandClassName="ConstraintConstrainedElementReorientCommand">
         <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
+            href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
         <elementType
             xsi:type="gmfgen:SpecializationType"
             uniqueIdentifier="org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge"
@@ -1812,7 +1812,7 @@
         <modelFacet
             xsi:type="gmfgen:FeatureLinkModelFacet">
           <metaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/constrainedElement"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/constrainedElement"/>
         </modelFacet>
       </links>
       <links
@@ -1823,7 +1823,7 @@
           createCommandClassName="GeneralOrderingCreateCommand"
           reorientCommandClassName="GeneralOrderingReorientCommand">
         <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
+            href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
         <elementType
             xsi:type="gmfgen:MetamodelType"
             uniqueIdentifier="org.eclipse.papyrus.umldi.GeneralOrdering_Edge"
@@ -1839,24 +1839,24 @@
         <modelFacet
             xsi:type="gmfgen:TypeLinkModelFacet">
           <metaClass
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/GeneralOrdering"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/GeneralOrdering"/>
           <containmentMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InteractionFragment/generalOrdering"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InteractionFragment/generalOrdering"/>
           <childMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InteractionFragment/generalOrdering"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/InteractionFragment/generalOrdering"/>
           <modelElementInitializer
               xsi:type="gmfgen:GenFeatureSeqInitializer">
             <initializers
                 xsi:type="gmfgen:GenFeatureValueSpec"
                 value="/0/@expressionProviders/@providers.0/@expressions.18">
               <feature
-                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
+                  href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
             </initializers>
           </modelElementInitializer>
           <sourceMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/GeneralOrdering/before"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/GeneralOrdering/before"/>
           <targetMetaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/GeneralOrdering/after"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/GeneralOrdering/after"/>
         </modelFacet>
         <labels
             visualID="6015"
@@ -1866,7 +1866,7 @@
             readOnly="true"
             elementIcon="true">
           <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+              href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap
               xsi:type="gmfgen:ParentAssignedViewmap"
               getterName="getAppliedStereotypeLabel"
@@ -1887,7 +1887,7 @@
           createCommandClassName="ContextLinkCreateCommand"
           reorientCommandClassName="ContextLinkReorientCommand">
         <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
+            href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
         <elementType
             xsi:type="gmfgen:SpecializationType"
             uniqueIdentifier="org.eclipse.papyrus.umldi.Constraint_ContextEdge"
@@ -1902,7 +1902,7 @@
         <modelFacet
             xsi:type="gmfgen:FeatureLinkModelFacet">
           <metaFeature
-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/context"/>
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/context"/>
         </modelFacet>
         <labels
             visualID="8501"
@@ -1910,7 +1910,7 @@
             itemSemanticEditPolicyClassName="ConstraintContextAppliedStereotypeItemSemanticEditPolicy"
             readOnly="true">
           <diagramRunTimeClass
-              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+              href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap
               xsi:type="gmfgen:ParentAssignedViewmap"
               getterName="getAppliedStereotypeLabel"
@@ -1927,6 +1927,86 @@
               parser="/0/@labelParsers/@implementations.0"/>
         </labels>
       </links>
+      <links
+          visualID="4013"
+          editPartClassName="DurationConstraintLinkEditPart"
+          itemSemanticEditPolicyClassName="DurationConstraintSemanticEditPolicy"
+          createCommandClassName="DurationConstraintCreateCommand"
+          reorientCommandClassName="DurationConstraintReorientCommand">
+        <diagramRunTimeClass
+            href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Connector"/>
+        <elementType
+            xsi:type="gmfgen:MetamodelType"
+            uniqueIdentifier="org.eclipse.papyrus.umldi.DurationConstraint_Edge"
+            displayName="DurationConstraint"
+            definedExternally="true"
+            editHelperClassName="DurationConstraintEditHelper"/>
+        <viewmap
+            xsi:type="gmfgen:FigureViewmap"
+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.figures.DurationLinkFigure"/>
+        <modelFacet
+            xsi:type="gmfgen:TypeLinkModelFacet">
+          <metaClass
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DurationConstraint"/>
+          <containmentMetaFeature
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>
+          <childMetaFeature
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Namespace/ownedRule"/>
+          <modelElementInitializer
+              xsi:type="gmfgen:GenFeatureSeqInitializer">
+            <initializers
+                xsi:type="gmfgen:GenFeatureValueSpec"
+                value="/0/@expressionProviders/@providers.0/@expressions.18">
+              <feature
+                  href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
+            </initializers>
+          </modelElementInitializer>
+          <sourceMetaFeature
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/constrainedElement"/>
+          <targetMetaFeature
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Constraint/constrainedElement"/>
+        </modelFacet>
+      </links>
+      <links
+          visualID="4014"
+          editPartClassName="DurationObservationLinkEditPart"
+          itemSemanticEditPolicyClassName="DurationObservationSemanticEditPolicy"
+          createCommandClassName="DurationObservationCreateCommand"
+          reorientCommandClassName="DurationObservationReorientCommand">
+        <diagramRunTimeClass
+            href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Connector"/>
+        <elementType
+            xsi:type="gmfgen:MetamodelType"
+            uniqueIdentifier="org.eclipse.papyrus.umldi.DurationObservation_Edge"
+            displayName="DurationObservation"
+            definedExternally="true"
+            editHelperClassName="DurationObservationEditHelper"/>
+        <viewmap
+            xsi:type="gmfgen:FigureViewmap"
+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.figures.DurationLinkFigure"/>
+        <modelFacet
+            xsi:type="gmfgen:TypeLinkModelFacet">
+          <metaClass
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DurationObservation"/>
+          <containmentMetaFeature
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
+          <childMetaFeature
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package/packagedElement"/>
+          <modelElementInitializer
+              xsi:type="gmfgen:GenFeatureSeqInitializer">
+            <initializers
+                xsi:type="gmfgen:GenFeatureValueSpec"
+                value="/0/@expressionProviders/@providers.0/@expressions.18">
+              <feature
+                  href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
+            </initializers>
+          </modelElementInitializer>
+          <sourceMetaFeature
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DurationObservation/event"/>
+          <targetMetaFeature
+              href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/DurationObservation/event"/>
+        </modelFacet>
+      </links>
       <compartments
           visualID="7001"
           editPartClassName="InteractionInteractionCompartmentEditPart"
@@ -1940,7 +2020,7 @@
           node="/0/@diagram/@topLevelNodes.0"
           listLayout="false">
         <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+            href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <viewmap
             xsi:type="gmfgen:ParentAssignedViewmap"
             getterName="getCompartmentFigure"
@@ -1970,7 +2050,7 @@
           needsTitle="false"
           node="/0/@diagram/@childNodes.1">
         <diagramRunTimeClass
-            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
+            href="platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <viewmap
             xsi:type="gmfgen:ParentAssignedViewmap"
             getterName="getCompartmentFigure"
@@ -2043,7 +2123,7 @@
       </tabs>
     </propertySheet>
     <domainGenModel
-        href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#/"/>
+        href="platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#/"/>
     <expressionProviders>
       <providers
           xsi:type="gmfgen:GenJavaExpressionProvider"
@@ -2542,5 +2622,11 @@
           genView="/0/@diagram/@childNodes.14/@labels.0"
           visualID="Gate_NameLabel"/>
     </child>
+    <child
+        genView="/0/@diagram/@links.11"
+        visualID="DurationConstraint_Edge"/>
+    <child
+        genView="/0/@diagram/@links.12"
+        visualID="DurationObservation_Edge"/>
   </papyrusgmfgenextension:VisualIDOverride>
 </xmi:XMI>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml
index 37525509844..c1ddf3f4261 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml
@@ -134,7 +134,7 @@
 	         <Priority name="Lowest"/>
 	         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="PapyrusUMLSequenceDiagram"/>
 	         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="Interaction_Shape,ConsiderIgnoreFragment_Shape,CombinedFragment_Shape,InteractionOperand_Shape,InteractionUse_Shape,Continuation_Shape,Lifeline_Shape,ActionExecutionSpecification_Shape,BehaviorExecutionSpecification_Shape,StateInvariant_Shape,TimeConstraint_Shape,TimeObservation_Shape,DestructionOccurrenceSpecification_Shape,Constraint_Shape,Comment_Shape,Gate_Shape"/>
-         <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="Message_SynchEdge,Message_AsynchEdge,Message_ReplyEdge,Message_CreateEdge,Message_DeleteEdge,Message_LostEdge,Message_FoundEdge,Comment_AnnotatedElementEdge,Constraint_ConstrainedElementEdge,GeneralOrdering_Edge,Constraint_ContextEdge"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="Message_SynchEdge,Message_AsynchEdge,Message_ReplyEdge,Message_CreateEdge,Message_DeleteEdge,Message_LostEdge,Message_FoundEdge,Comment_AnnotatedElementEdge,Constraint_ConstrainedElementEdge,GeneralOrdering_Edge,Constraint_ContextEdge,DurationConstraint_Edge,DurationObservation_Edge"/>
 	      </viewProvider>
 	   </extension>
 
@@ -149,7 +149,7 @@
 	            <method name="getType()" value="Interaction_Shape,ConsiderIgnoreFragment_Shape,CombinedFragment_Shape,InteractionOperand_Shape,InteractionUse_Shape,Continuation_Shape,Lifeline_Shape,ActionExecutionSpecification_Shape,BehaviorExecutionSpecification_Shape,StateInvariant_Shape,TimeConstraint_Shape,TimeObservation_Shape,DestructionOccurrenceSpecification_Shape,Constraint_Shape,Comment_Shape,Gate_Shape"/>
 	         </object>
 	         <object class="org.eclipse.gmf.runtime.notation.Edge" id="generated-links">
-	            <method name="getType()" value="Message_SynchEdge,Message_AsynchEdge,Message_ReplyEdge,Message_CreateEdge,Message_DeleteEdge,Message_LostEdge,Message_FoundEdge,Comment_AnnotatedElementEdge,Constraint_ConstrainedElementEdge,GeneralOrdering_Edge,Constraint_ContextEdge"/>
+	            <method name="getType()" value="Message_SynchEdge,Message_AsynchEdge,Message_ReplyEdge,Message_CreateEdge,Message_DeleteEdge,Message_LostEdge,Message_FoundEdge,Comment_AnnotatedElementEdge,Constraint_ConstrainedElementEdge,GeneralOrdering_Edge,Constraint_ContextEdge,DurationConstraint_Edge,DurationObservation_Edge"/>
 	         </object>
 	         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-labels">
 	            <method name="getType()" value="Interaction_NameLabel,InteractionUse_NameLabel,InteractionUse_TypeLabel,Continuation_NameLabel,Lifeline_NameLabel,StateInvariant_NameLabel,StateInvariant_ConstraintLabel,TimeConstraint_ConstraintLabel,TimeConstraint_StereotypeLabel,TimeObservation_NameLabel,TimeObservation_StereotypeLabel,Constraint_NameLabel,Constraint_BodyLabel,Comment_BodyLabel,Gate_NameLabel"/>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationConstraintLinkEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationConstraintLinkEditPart.java
new file mode 100644
index 00000000000..1b2fd6aa9d6
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationConstraintLinkEditPart.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) 2016 CEA LIST.
+  *
+  * All rights reserved. This program and the accompanying materials
+  * are made available under the terms of the Eclipse Public License v1.0
+  * which accompanies this distribution, and is available at
+  * http://www.eclipse.org/legal/epl-v10.html
+  *
+  * Contributors:
+  *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;
+
+import org.eclipse.draw2d.Connection;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.sequence.figures.DurationLinkFigure;
+
+/**
+ * @generated
+ */
+public class DurationConstraintLinkEditPart extends ConnectionEditPart implements ITreeBranchEditPart {
+
+	/**
+	 * @generated
+	 */
+	public static final String VISUAL_ID = "DurationConstraint_Edge";
+
+	/**
+	 * @generated
+	 */
+	public DurationConstraintLinkEditPart(View view) {
+		super(view);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
+	}
+
+	/**
+	 * Creates figure for this edit part.
+	 *
+	 * Body of this method does not depend on settings in generation model
+	 * so you may safely remove <i>generated</i> tag and modify it.
+	 *
+	 * @generated
+	 */
+	@Override
+	protected Connection createConnectionFigure() {
+		return new DurationLinkFigure();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public DurationLinkFigure getPrimaryShape() {
+		return (DurationLinkFigure) getFigure();
+	}
+
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationObservationLinkEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationObservationLinkEditPart.java
new file mode 100644
index 00000000000..7ed9bd00e00
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationObservationLinkEditPart.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) 2016 CEA LIST.
+  *
+  * All rights reserved. This program and the accompanying materials
+  * are made available under the terms of the Eclipse Public License v1.0
+  * which accompanies this distribution, and is available at
+  * http://www.eclipse.org/legal/epl-v10.html
+  *
+  * Contributors:
+  *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;
+
+import org.eclipse.draw2d.Connection;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;
+import org.eclipse.papyrus.uml.diagram.sequence.figures.DurationLinkFigure;
+
+/**
+ * @generated
+ */
+public class DurationObservationLinkEditPart extends ConnectionEditPart implements ITreeBranchEditPart {
+
+	/**
+	 * @generated
+	 */
+	public static final String VISUAL_ID = "DurationObservation_Edge";
+
+	/**
+	 * @generated
+	 */
+	public DurationObservationLinkEditPart(View view) {
+		super(view);
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	protected void createDefaultEditPolicies() {
+		super.createDefaultEditPolicies();
+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy());
+	}
+
+	/**
+	 * Creates figure for this edit part.
+	 *
+	 * Body of this method does not depend on settings in generation model
+	 * so you may safely remove <i>generated</i> tag and modify it.
+	 *
+	 * @generated
+	 */
+	@Override
+	protected Connection createConnectionFigure() {
+		return new DurationLinkFigure();
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
+	public DurationLinkFigure getPrimaryShape() {
+		return (DurationLinkFigure) getFigure();
+	}
+
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/UMLEditPartFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/UMLEditPartFactory.java
index 126451eb9be..eeb9e8c5af8 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/UMLEditPartFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/UMLEditPartFactory.java
@@ -211,6 +211,12 @@ public class UMLEditPartFactory implements EditPartFactory {
 			case ConstraintContextAppliedStereotypeEditPart.VISUAL_ID:
 				return new ConstraintContextAppliedStereotypeEditPart(view);
 
+			case DurationConstraintLinkEditPart.VISUAL_ID:
+				return new DurationConstraintLinkEditPart(view);
+
+			case DurationObservationLinkEditPart.VISUAL_ID:
+				return new DurationObservationLinkEditPart(view);
+
 			}
 		}
 		return createUnrecognizedEditPart(context, model);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UMLBaseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UMLBaseItemSemanticEditPolicy.java
index accb821f707..176bf91c2a6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UMLBaseItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UMLBaseItemSemanticEditPolicy.java
@@ -56,13 +56,17 @@ import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;
 import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;
 import org.eclipse.uml2.uml.Comment;
 import org.eclipse.uml2.uml.Constraint;
+import org.eclipse.uml2.uml.DurationConstraint;
+import org.eclipse.uml2.uml.DurationObservation;
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.GeneralOrdering;
 import org.eclipse.uml2.uml.Interaction;
 import org.eclipse.uml2.uml.InteractionFragment;
 import org.eclipse.uml2.uml.Message;
+import org.eclipse.uml2.uml.NamedElement;
 import org.eclipse.uml2.uml.Namespace;
 import org.eclipse.uml2.uml.OccurrenceSpecification;
+import org.eclipse.uml2.uml.Package;
 import org.eclipse.uml2.uml.UMLPackage;
 
 /**
@@ -473,6 +477,20 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		/**
 		 * @generated
 		 */
+		public boolean canCreateDurationConstraint_Edge(Namespace container, Element source, Element target) {
+			return canExistDurationConstraint_Edge(container, null, source, target);
+		}
+
+		/**
+		 * @generated
+		 */
+		public boolean canCreateDurationObservation_Edge(Package container, NamedElement source, NamedElement target) {
+			return canExistDurationObservation_Edge(container, null, source, target);
+		}
+
+		/**
+		 * @generated
+		 */
 		public boolean canExistMessage_SynchEdge(Interaction container, Message linkInstance, Element source,
 				Element target) {
 			try {
@@ -743,6 +761,22 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		public boolean canExistConstraint_ContextEdge(Constraint source, Namespace target) {
 			return true;
 		}
+
+		/**
+		 * @generated
+		 */
+		public boolean canExistDurationConstraint_Edge(Namespace container, DurationConstraint linkInstance,
+				Element source, Element target) {
+			return true;
+		}
+
+		/**
+		 * @generated
+		 */
+		public boolean canExistDurationObservation_Edge(Package container, DurationObservation linkInstance,
+				NamedElement source, NamedElement target) {
+			return true;
+		}
 	}
 
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/part/UMLDiagramEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/part/UMLDiagramEditor.java
index 80898bc1f6e..73ed244bd78 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/part/UMLDiagramEditor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/part/UMLDiagramEditor.java
@@ -22,6 +22,7 @@ import org.eclipse.gef.GraphicalViewer;
 import org.eclipse.gef.KeyHandler;
 import org.eclipse.gef.Tool;
 import org.eclipse.gef.commands.CommandStackListener;
+import org.eclipse.gef.palette.PaletteRoot;
 import org.eclipse.gef.ui.palette.PaletteViewer;
 import org.eclipse.gef.ui.palette.PaletteViewerProvider;
 import org.eclipse.gmf.runtime.common.core.service.IProviderChangeListener;
@@ -127,6 +128,22 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 	 * @generated
 	 */
 	@Override
+	protected PaletteRoot createPaletteRoot(PaletteRoot existingPaletteRoot) {
+		PaletteRoot paletteRoot;
+		if (existingPaletteRoot == null) {
+			paletteRoot = PapyrusPaletteService.getInstance().createPalette(this, getDefaultPaletteContent());
+		} else {
+			PapyrusPaletteService.getInstance().updatePalette(existingPaletteRoot, this, getDefaultPaletteContent());
+			paletteRoot = existingPaletteRoot;
+		}
+		applyCustomizationsToPalette(paletteRoot);
+		return paletteRoot;
+	}
+
+	/**
+	 * @generated
+	 */
+	@Override
 	protected PreferencesHint getPreferencesHint() {
 		return UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT;
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/part/UMLDiagramUpdater.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/part/UMLDiagramUpdater.java
index c339e7bbdcd..d02b71db1ad 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/part/UMLDiagramUpdater.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/part/UMLDiagramUpdater.java
@@ -40,6 +40,8 @@ import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ContextLinkEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ContinuationEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DestructionOccurrenceSpecificationEditPart;
+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintLinkEditPart;
+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationObservationLinkEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.GateEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.GeneralOrderingEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionEditPart;
@@ -67,6 +69,8 @@ import org.eclipse.uml2.uml.ConsiderIgnoreFragment;
 import org.eclipse.uml2.uml.Constraint;
 import org.eclipse.uml2.uml.Continuation;
 import org.eclipse.uml2.uml.DestructionOccurrenceSpecification;
+import org.eclipse.uml2.uml.DurationConstraint;
+import org.eclipse.uml2.uml.DurationObservation;
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.Gate;
 import org.eclipse.uml2.uml.GeneralOrdering;
@@ -76,6 +80,7 @@ import org.eclipse.uml2.uml.InteractionOperand;
 import org.eclipse.uml2.uml.InteractionUse;
 import org.eclipse.uml2.uml.Lifeline;
 import org.eclipse.uml2.uml.Message;
+import org.eclipse.uml2.uml.NamedElement;
 import org.eclipse.uml2.uml.Namespace;
 import org.eclipse.uml2.uml.OccurrenceSpecification;
 import org.eclipse.uml2.uml.Package;
@@ -452,6 +457,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				return getMessage_FoundEdge_ContainedLinks(view);
 			case GeneralOrderingEditPart.VISUAL_ID:
 				return getGeneralOrdering_Edge_ContainedLinks(view);
+			case DurationConstraintLinkEditPart.VISUAL_ID:
+				return getDurationConstraint_Edge_ContainedLinks(view);
+			case DurationObservationLinkEditPart.VISUAL_ID:
+				return getDurationObservation_Edge_ContainedLinks(view);
 			}
 		}
 		return Collections.emptyList();
@@ -513,6 +522,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				return getMessage_FoundEdge_IncomingLinks(view);
 			case GeneralOrderingEditPart.VISUAL_ID:
 				return getGeneralOrdering_Edge_IncomingLinks(view);
+			case DurationConstraintLinkEditPart.VISUAL_ID:
+				return getDurationConstraint_Edge_IncomingLinks(view);
+			case DurationObservationLinkEditPart.VISUAL_ID:
+				return getDurationObservation_Edge_IncomingLinks(view);
 			}
 		}
 		return Collections.emptyList();
@@ -574,6 +587,10 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 				return getMessage_FoundEdge_OutgoingLinks(view);
 			case GeneralOrderingEditPart.VISUAL_ID:
 				return getGeneralOrdering_Edge_OutgoingLinks(view);
+			case DurationConstraintLinkEditPart.VISUAL_ID:
+				return getDurationConstraint_Edge_OutgoingLinks(view);
+			case DurationObservationLinkEditPart.VISUAL_ID:
+				return getDurationObservation_Edge_OutgoingLinks(view);
 			}
 		}
 		return Collections.emptyList();
@@ -583,7 +600,11 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	 * @generated
 	 */
 	public List<UMLLinkDescriptor> getPackage_SequenceDiagram_ContainedLinks(View view) {
-		return Collections.emptyList();
+		Package modelElement = (Package) view.getElement();
+		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();
+		result.addAll(getContainedTypeModelFacetLinks_DurationConstraint_Edge(modelElement));
+		result.addAll(getContainedTypeModelFacetLinks_DurationObservation_Edge(modelElement));
+		return result;
 	}
 
 	/**
@@ -600,6 +621,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getContainedTypeModelFacetLinks_Message_LostEdge(modelElement));
 		result.addAll(getContainedTypeModelFacetLinks_Message_FoundEdge(modelElement));
 		result.addAll(getContainedTypeModelFacetLinks_GeneralOrdering_Edge(modelElement));
+		result.addAll(getContainedTypeModelFacetLinks_DurationConstraint_Edge(modelElement));
 		return result;
 	}
 
@@ -630,6 +652,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		InteractionOperand modelElement = (InteractionOperand) view.getElement();
 		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();
 		result.addAll(getContainedTypeModelFacetLinks_GeneralOrdering_Edge(modelElement));
+		result.addAll(getContainedTypeModelFacetLinks_DurationConstraint_Edge(modelElement));
 		return result;
 	}
 
@@ -805,6 +828,24 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	/**
 	 * @generated
 	 */
+	public List<UMLLinkDescriptor> getDurationConstraint_Edge_ContainedLinks(View view) {
+		DurationConstraint modelElement = (DurationConstraint) view.getElement();
+		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();
+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement));
+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ContextEdge(modelElement));
+		return result;
+	}
+
+	/**
+	 * @generated
+	 */
+	public List<UMLLinkDescriptor> getDurationObservation_Edge_ContainedLinks(View view) {
+		return Collections.emptyList();
+	}
+
+	/**
+	 * @generated
+	 */
 	public List<UMLLinkDescriptor> getInteraction_Shape_IncomingLinks(View view) {
 		Interaction modelElement = (Interaction) view.getElement();
 		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter
@@ -821,6 +862,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(
 				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
 		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ContextEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationConstraint_Edge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationObservation_Edge(modelElement, crossReferencer));
 		return result;
 	}
 
@@ -842,6 +885,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
 		result.addAll(
 				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationConstraint_Edge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationObservation_Edge(modelElement, crossReferencer));
 		return result;
 	}
 
@@ -863,6 +908,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
 		result.addAll(
 				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationConstraint_Edge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationObservation_Edge(modelElement, crossReferencer));
 		return result;
 	}
 
@@ -885,6 +932,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(
 				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
 		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ContextEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationConstraint_Edge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationObservation_Edge(modelElement, crossReferencer));
 		return result;
 	}
 
@@ -906,6 +955,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
 		result.addAll(
 				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationConstraint_Edge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationObservation_Edge(modelElement, crossReferencer));
 		return result;
 	}
 
@@ -927,6 +978,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
 		result.addAll(
 				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationConstraint_Edge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationObservation_Edge(modelElement, crossReferencer));
 		return result;
 	}
 
@@ -948,6 +1001,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
 		result.addAll(
 				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationConstraint_Edge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationObservation_Edge(modelElement, crossReferencer));
 		return result;
 	}
 
@@ -969,6 +1024,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
 		result.addAll(
 				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationConstraint_Edge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationObservation_Edge(modelElement, crossReferencer));
 		return result;
 	}
 
@@ -990,6 +1047,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
 		result.addAll(
 				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationConstraint_Edge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationObservation_Edge(modelElement, crossReferencer));
 		return result;
 	}
 
@@ -1011,6 +1070,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
 		result.addAll(
 				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationConstraint_Edge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationObservation_Edge(modelElement, crossReferencer));
 		return result;
 	}
 
@@ -1032,6 +1093,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
 		result.addAll(
 				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationConstraint_Edge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationObservation_Edge(modelElement, crossReferencer));
 		return result;
 	}
 
@@ -1053,6 +1116,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
 		result.addAll(
 				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationConstraint_Edge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationObservation_Edge(modelElement, crossReferencer));
 		return result;
 	}
 
@@ -1075,6 +1140,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(
 				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
 		result.addAll(getIncomingTypeModelFacetLinks_GeneralOrdering_Edge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationConstraint_Edge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationObservation_Edge(modelElement, crossReferencer));
 		return result;
 	}
 
@@ -1096,6 +1163,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
 		result.addAll(
 				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationConstraint_Edge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationObservation_Edge(modelElement, crossReferencer));
 		return result;
 	}
 
@@ -1117,6 +1186,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
 		result.addAll(
 				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationConstraint_Edge(modelElement, crossReferencer));
 		return result;
 	}
 
@@ -1138,6 +1208,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
 		result.addAll(
 				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationConstraint_Edge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationObservation_Edge(modelElement, crossReferencer));
 		return result;
 	}
 
@@ -1159,6 +1231,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
 		result.addAll(
 				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationConstraint_Edge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationObservation_Edge(modelElement, crossReferencer));
 		return result;
 	}
 
@@ -1180,6 +1254,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
 		result.addAll(
 				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationConstraint_Edge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationObservation_Edge(modelElement, crossReferencer));
 		return result;
 	}
 
@@ -1201,6 +1277,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
 		result.addAll(
 				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationConstraint_Edge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationObservation_Edge(modelElement, crossReferencer));
 		return result;
 	}
 
@@ -1222,6 +1300,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
 		result.addAll(
 				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationConstraint_Edge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationObservation_Edge(modelElement, crossReferencer));
 		return result;
 	}
 
@@ -1243,6 +1323,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
 		result.addAll(
 				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationConstraint_Edge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationObservation_Edge(modelElement, crossReferencer));
 		return result;
 	}
 
@@ -1264,6 +1346,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
 		result.addAll(
 				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationConstraint_Edge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationObservation_Edge(modelElement, crossReferencer));
 		return result;
 	}
 
@@ -1285,6 +1369,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
 		result.addAll(
 				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationConstraint_Edge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationObservation_Edge(modelElement, crossReferencer));
 		return result;
 	}
 
@@ -1306,6 +1392,54 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
 		result.addAll(
 				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationConstraint_Edge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationObservation_Edge(modelElement, crossReferencer));
+		return result;
+	}
+
+	/**
+	 * @generated
+	 */
+	public List<UMLLinkDescriptor> getDurationConstraint_Edge_IncomingLinks(View view) {
+		DurationConstraint modelElement = (DurationConstraint) view.getElement();
+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter
+				.getCrossReferenceAdapter(view.eResource().getResourceSet());
+		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();
+		result.addAll(getIncomingTypeModelFacetLinks_Message_SynchEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_Message_AsynchEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_Message_ReplyEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_Message_CreateEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_Message_DeleteEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_Message_LostEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_Message_FoundEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
+		result.addAll(
+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationConstraint_Edge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationObservation_Edge(modelElement, crossReferencer));
+		return result;
+	}
+
+	/**
+	 * @generated
+	 */
+	public List<UMLLinkDescriptor> getDurationObservation_Edge_IncomingLinks(View view) {
+		DurationObservation modelElement = (DurationObservation) view.getElement();
+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter
+				.getCrossReferenceAdapter(view.eResource().getResourceSet());
+		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();
+		result.addAll(getIncomingTypeModelFacetLinks_Message_SynchEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_Message_AsynchEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_Message_ReplyEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_Message_CreateEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_Message_DeleteEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_Message_LostEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_Message_FoundEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer));
+		result.addAll(
+				getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationConstraint_Edge(modelElement, crossReferencer));
+		result.addAll(getIncomingTypeModelFacetLinks_DurationObservation_Edge(modelElement, crossReferencer));
 		return result;
 	}
 
@@ -1322,6 +1456,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_DeleteEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_LostEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_FoundEdge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationConstraint_Edge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationObservation_Edge(modelElement));
 		return result;
 	}
 
@@ -1338,6 +1474,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_DeleteEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_LostEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_FoundEdge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationConstraint_Edge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationObservation_Edge(modelElement));
 		return result;
 	}
 
@@ -1354,6 +1492,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_DeleteEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_LostEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_FoundEdge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationConstraint_Edge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationObservation_Edge(modelElement));
 		return result;
 	}
 
@@ -1370,6 +1510,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_DeleteEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_LostEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_FoundEdge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationConstraint_Edge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationObservation_Edge(modelElement));
 		return result;
 	}
 
@@ -1386,6 +1528,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_DeleteEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_LostEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_FoundEdge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationConstraint_Edge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationObservation_Edge(modelElement));
 		return result;
 	}
 
@@ -1402,6 +1546,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_DeleteEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_LostEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_FoundEdge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationConstraint_Edge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationObservation_Edge(modelElement));
 		return result;
 	}
 
@@ -1418,6 +1564,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_DeleteEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_LostEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_FoundEdge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationConstraint_Edge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationObservation_Edge(modelElement));
 		return result;
 	}
 
@@ -1434,6 +1582,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_DeleteEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_LostEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_FoundEdge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationConstraint_Edge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationObservation_Edge(modelElement));
 		return result;
 	}
 
@@ -1450,6 +1600,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_DeleteEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_LostEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_FoundEdge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationConstraint_Edge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationObservation_Edge(modelElement));
 		return result;
 	}
 
@@ -1466,6 +1618,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_DeleteEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_LostEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_FoundEdge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationConstraint_Edge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationObservation_Edge(modelElement));
 		return result;
 	}
 
@@ -1484,6 +1638,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_FoundEdge(modelElement));
 		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement));
 		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ContextEdge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationConstraint_Edge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationObservation_Edge(modelElement));
 		return result;
 	}
 
@@ -1500,6 +1656,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_DeleteEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_LostEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_FoundEdge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationConstraint_Edge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationObservation_Edge(modelElement));
 		return result;
 	}
 
@@ -1517,6 +1675,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_LostEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_FoundEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_GeneralOrdering_Edge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationConstraint_Edge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationObservation_Edge(modelElement));
 		return result;
 	}
 
@@ -1535,6 +1695,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_FoundEdge(modelElement));
 		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement));
 		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ContextEdge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationConstraint_Edge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationObservation_Edge(modelElement));
 		return result;
 	}
 
@@ -1552,6 +1714,7 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_LostEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_FoundEdge(modelElement));
 		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationConstraint_Edge(modelElement));
 		return result;
 	}
 
@@ -1568,6 +1731,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_DeleteEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_LostEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_FoundEdge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationConstraint_Edge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationObservation_Edge(modelElement));
 		return result;
 	}
 
@@ -1584,6 +1749,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_DeleteEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_LostEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_FoundEdge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationConstraint_Edge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationObservation_Edge(modelElement));
 		return result;
 	}
 
@@ -1600,6 +1767,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_DeleteEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_LostEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_FoundEdge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationConstraint_Edge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationObservation_Edge(modelElement));
 		return result;
 	}
 
@@ -1616,6 +1785,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_DeleteEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_LostEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_FoundEdge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationConstraint_Edge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationObservation_Edge(modelElement));
 		return result;
 	}
 
@@ -1632,6 +1803,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_DeleteEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_LostEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_FoundEdge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationConstraint_Edge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationObservation_Edge(modelElement));
 		return result;
 	}
 
@@ -1648,6 +1821,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_DeleteEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_LostEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_FoundEdge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationConstraint_Edge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationObservation_Edge(modelElement));
 		return result;
 	}
 
@@ -1664,6 +1839,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_DeleteEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_LostEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_FoundEdge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationConstraint_Edge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationObservation_Edge(modelElement));
 		return result;
 	}
 
@@ -1680,6 +1857,8 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_DeleteEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_LostEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_FoundEdge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationConstraint_Edge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationObservation_Edge(modelElement));
 		return result;
 	}
 
@@ -1696,6 +1875,46 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_DeleteEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_LostEdge(modelElement));
 		result.addAll(getOutgoingTypeModelFacetLinks_Message_FoundEdge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationConstraint_Edge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationObservation_Edge(modelElement));
+		return result;
+	}
+
+	/**
+	 * @generated
+	 */
+	public List<UMLLinkDescriptor> getDurationConstraint_Edge_OutgoingLinks(View view) {
+		DurationConstraint modelElement = (DurationConstraint) view.getElement();
+		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();
+		result.addAll(getOutgoingTypeModelFacetLinks_Message_SynchEdge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_Message_AsynchEdge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_Message_ReplyEdge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_Message_CreateEdge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_Message_DeleteEdge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_Message_LostEdge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_Message_FoundEdge(modelElement));
+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement));
+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ContextEdge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationConstraint_Edge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationObservation_Edge(modelElement));
+		return result;
+	}
+
+	/**
+	 * @generated
+	 */
+	public List<UMLLinkDescriptor> getDurationObservation_Edge_OutgoingLinks(View view) {
+		DurationObservation modelElement = (DurationObservation) view.getElement();
+		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();
+		result.addAll(getOutgoingTypeModelFacetLinks_Message_SynchEdge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_Message_AsynchEdge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_Message_ReplyEdge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_Message_CreateEdge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_Message_DeleteEdge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_Message_LostEdge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_Message_FoundEdge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationConstraint_Edge(modelElement));
+		result.addAll(getOutgoingTypeModelFacetLinks_DurationObservation_Edge(modelElement));
 		return result;
 	}
 
@@ -1914,6 +2133,72 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	/**
 	 * @generated
 	 */
+	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_DurationConstraint_Edge(
+			Namespace container) {
+		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();
+		for (Iterator<?> links = container.getOwnedRules().iterator(); links.hasNext();) {
+			EObject linkObject = (EObject) links.next();
+			if (false == linkObject instanceof DurationConstraint) {
+				continue;
+			}
+			DurationConstraint link = (DurationConstraint) linkObject;
+			if (!DurationConstraintLinkEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
+				continue;
+			}
+			List<?> targets = link.getConstrainedElements();
+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
+			if (false == theTarget instanceof Element) {
+				continue;
+			}
+			Element dst = (Element) theTarget;
+			List<?> sources = link.getConstrainedElements();
+			Object theSource = sources.size() == 1 ? sources.get(0) : null;
+			if (false == theSource instanceof Element) {
+				continue;
+			}
+			Element src = (Element) theSource;
+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.DurationConstraint_Edge,
+					DurationConstraintLinkEditPart.VISUAL_ID));
+		}
+		return result;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_DurationObservation_Edge(
+			Package container) {
+		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();
+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {
+			EObject linkObject = (EObject) links.next();
+			if (false == linkObject instanceof DurationObservation) {
+				continue;
+			}
+			DurationObservation link = (DurationObservation) linkObject;
+			if (!DurationObservationLinkEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
+				continue;
+			}
+			List<?> targets = link.getEvents();
+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
+			if (false == theTarget instanceof NamedElement) {
+				continue;
+			}
+			NamedElement dst = (NamedElement) theTarget;
+			List<?> sources = link.getEvents();
+			Object theSource = sources.size() == 1 ? sources.get(0) : null;
+			if (false == theSource instanceof NamedElement) {
+				continue;
+			}
+			NamedElement src = (NamedElement) theSource;
+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.DurationObservation_Edge,
+					DurationObservationLinkEditPart.VISUAL_ID));
+		}
+		return result;
+	}
+
+	/**
+	 * @generated
+	 */
 	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Message_SynchEdge(Element target,
 			CrossReferenceAdapter crossReferencer) {
 		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();
@@ -2147,6 +2432,62 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 	/**
 	 * @generated
 	 */
+	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_DurationConstraint_Edge(Element target,
+			CrossReferenceAdapter crossReferencer) {
+		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();
+		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);
+		for (EStructuralFeature.Setting setting : settings) {
+			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getConstraint_ConstrainedElement()
+					|| false == setting.getEObject() instanceof DurationConstraint) {
+				continue;
+			}
+			DurationConstraint link = (DurationConstraint) setting.getEObject();
+			if (!DurationConstraintLinkEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
+				continue;
+			}
+			List<?> sources = link.getConstrainedElements();
+			Object theSource = sources.size() == 1 ? sources.get(0) : null;
+			if (false == theSource instanceof Element) {
+				continue;
+			}
+			Element src = (Element) theSource;
+			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.DurationConstraint_Edge,
+					DurationConstraintLinkEditPart.VISUAL_ID));
+		}
+		return result;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_DurationObservation_Edge(NamedElement target,
+			CrossReferenceAdapter crossReferencer) {
+		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();
+		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);
+		for (EStructuralFeature.Setting setting : settings) {
+			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDurationObservation_Event()
+					|| false == setting.getEObject() instanceof DurationObservation) {
+				continue;
+			}
+			DurationObservation link = (DurationObservation) setting.getEObject();
+			if (!DurationObservationLinkEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
+				continue;
+			}
+			List<?> sources = link.getEvents();
+			Object theSource = sources.size() == 1 ? sources.get(0) : null;
+			if (false == theSource instanceof NamedElement) {
+				continue;
+			}
+			NamedElement src = (NamedElement) theSource;
+			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.DurationObservation_Edge,
+					DurationObservationLinkEditPart.VISUAL_ID));
+		}
+		return result;
+	}
+
+	/**
+	 * @generated
+	 */
 	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Message_SynchEdge(Element source) {
 		Interaction container = null;
 		// Find container element for the link.
@@ -2519,4 +2860,99 @@ public class UMLDiagramUpdater implements DiagramUpdater {
 		return result;
 	}
 
+	/**
+	 * @generated
+	 */
+	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_DurationConstraint_Edge(Element source) {
+		Namespace container = null;
+		// Find container element for the link.
+		// Climb up by containment hierarchy starting from the source
+		// and return the first element that is instance of the container class.
+		for (EObject element = source; element != null && container == null; element = element.eContainer()) {
+			if (element instanceof Namespace) {
+				container = (Namespace) element;
+			}
+		}
+		if (container == null) {
+			return Collections.emptyList();
+		}
+		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();
+		for (Iterator<?> links = container.getOwnedRules().iterator(); links.hasNext();) {
+			EObject linkObject = (EObject) links.next();
+			if (false == linkObject instanceof DurationConstraint) {
+				continue;
+			}
+			DurationConstraint link = (DurationConstraint) linkObject;
+			if (!DurationConstraintLinkEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
+				continue;
+			}
+			List<?> targets = link.getConstrainedElements();
+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
+			if (false == theTarget instanceof Element) {
+				continue;
+			}
+			Element dst = (Element) theTarget;
+			List<?> sources = link.getConstrainedElements();
+			Object theSource = sources.size() == 1 ? sources.get(0) : null;
+			if (false == theSource instanceof Element) {
+				continue;
+			}
+			Element src = (Element) theSource;
+			if (src != source) {
+				continue;
+			}
+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.DurationConstraint_Edge,
+					DurationConstraintLinkEditPart.VISUAL_ID));
+		}
+		return result;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_DurationObservation_Edge(
+			NamedElement source) {
+		Package container = null;
+		// Find container element for the link.
+		// Climb up by containment hierarchy starting from the source
+		// and return the first element that is instance of the container class.
+		for (EObject element = source; element != null && container == null; element = element.eContainer()) {
+			if (element instanceof Package) {
+				container = (Package) element;
+			}
+		}
+		if (container == null) {
+			return Collections.emptyList();
+		}
+		LinkedList<UMLLinkDescriptor> result = new LinkedList<>();
+		for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {
+			EObject linkObject = (EObject) links.next();
+			if (false == linkObject instanceof DurationObservation) {
+				continue;
+			}
+			DurationObservation link = (DurationObservation) linkObject;
+			if (!DurationObservationLinkEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) {
+				continue;
+			}
+			List<?> targets = link.getEvents();
+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
+			if (false == theTarget instanceof NamedElement) {
+				continue;
+			}
+			NamedElement dst = (NamedElement) theTarget;
+			List<?> sources = link.getEvents();
+			Object theSource = sources.size() == 1 ? sources.get(0) : null;
+			if (false == theSource instanceof NamedElement) {
+				continue;
+			}
+			NamedElement src = (NamedElement) theSource;
+			if (src != source) {
+				continue;
+			}
+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.DurationObservation_Edge,
+					DurationObservationLinkEditPart.VISUAL_ID));
+		}
+		return result;
+	}
+
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/part/UMLVisualIDRegistry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/part/UMLVisualIDRegistry.java
index 702b191fa42..f3ce91873f8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/part/UMLVisualIDRegistry.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/part/UMLVisualIDRegistry.java
@@ -33,6 +33,8 @@ import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ContextLinkEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ContinuationEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ContinuationNameEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DestructionOccurrenceSpecificationEditPart;
+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintLinkEditPart;
+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationObservationLinkEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.GateEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.GateNameEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.GeneralOrderingAppliedStereotypeEditPart;
@@ -536,6 +538,12 @@ public class UMLVisualIDRegistry {
 		if (UMLPackage.eINSTANCE.getGeneralOrdering().isSuperTypeOf(domainElement.eClass())) {
 			return GeneralOrderingEditPart.VISUAL_ID;
 		}
+		if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {
+			return DurationConstraintLinkEditPart.VISUAL_ID;
+		}
+		if (UMLPackage.eINSTANCE.getDurationObservation().isSuperTypeOf(domainElement.eClass())) {
+			return DurationObservationLinkEditPart.VISUAL_ID;
+		}
 		return "";
 	}
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/providers/ElementInitializers.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/providers/ElementInitializers.java
index 105e659c32c..a6a55531a4b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/providers/ElementInitializers.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/providers/ElementInitializers.java
@@ -26,7 +26,9 @@ import org.eclipse.uml2.uml.Constraint;
 import org.eclipse.uml2.uml.Continuation;
 import org.eclipse.uml2.uml.DestructionOccurrenceSpecification;
 import org.eclipse.uml2.uml.Duration;
+import org.eclipse.uml2.uml.DurationConstraint;
 import org.eclipse.uml2.uml.DurationInterval;
+import org.eclipse.uml2.uml.DurationObservation;
 import org.eclipse.uml2.uml.GeneralOrdering;
 import org.eclipse.uml2.uml.Interaction;
 import org.eclipse.uml2.uml.InteractionUse;
@@ -288,6 +290,34 @@ public class ElementInitializers {
 	/**
 	 * @generated
 	 */
+	public void init_DurationConstraint_Edge(DurationConstraint instance) {
+		try {
+			Object value_0 = name_DurationConstraint_Edge(instance);
+			if (value_0 != null) {
+				instance.setName((String) value_0);
+			}
+		} catch (RuntimeException e) {
+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	public void init_DurationObservation_Edge(DurationObservation instance) {
+		try {
+			Object value_0 = name_DurationObservation_Edge(instance);
+			if (value_0 != null) {
+				instance.setName((String) value_0);
+			}
+		} catch (RuntimeException e) {
+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$
+		}
+	}
+
+	/**
+	 * @generated
+	 */
 	private String name_Interaction_Shape(Interaction it) {
 		return getNamedElement(it, "", it.eClass().getName(), "");
 	}
@@ -379,6 +409,20 @@ public class ElementInitializers {
 	/**
 	 * @generated
 	 */
+	private String name_DurationConstraint_Edge(DurationConstraint it) {
+		return getNamedElement(it, "", it.eClass().getName(), "");
+	}
+
+	/**
+	 * @generated
+	 */
+	private String name_DurationObservation_Edge(DurationObservation it) {
+		return getNamedElement(it, "", it.eClass().getName(), "");
+	}
+
+	/**
+	 * @generated
+	 */
 	public static ElementInitializers getInstance() {
 		ElementInitializers cached = UMLDiagramEditorPlugin.getInstance().getElementInitializers();
 		if (cached == null) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/providers/UMLElementTypes.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/providers/UMLElementTypes.java
index 76737e37dfd..3c674b8115b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/providers/UMLElementTypes.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/providers/UMLElementTypes.java
@@ -35,6 +35,8 @@ import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ContextLinkEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ContinuationEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DestructionOccurrenceSpecificationEditPart;
+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintLinkEditPart;
+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationObservationLinkEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.GateEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.GeneralOrderingEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionEditPart;
@@ -227,6 +229,18 @@ public class UMLElementTypes {
 	/**
 	 * @generated
 	 */
+	public static final IElementType DurationConstraint_Edge = getElementTypeByUniqueId(
+			"org.eclipse.papyrus.umldi.DurationConstraint_Edge"); //$NON-NLS-1$
+
+	/**
+	 * @generated
+	 */
+	public static final IElementType DurationObservation_Edge = getElementTypeByUniqueId(
+			"org.eclipse.papyrus.umldi.DurationObservation_Edge"); //$NON-NLS-1$
+
+	/**
+	 * @generated
+	 */
 	public static ImageDescriptor getImageDescriptor(ENamedElement element) {
 		return elementTypeImages.getImageDescriptor(element);
 	}
@@ -319,6 +333,10 @@ public class UMLElementTypes {
 			elements.put(GeneralOrdering_Edge, UMLPackage.eINSTANCE.getGeneralOrdering());
 
 			elements.put(Constraint_ContextEdge, UMLPackage.eINSTANCE.getConstraint_Context());
+
+			elements.put(DurationConstraint_Edge, UMLPackage.eINSTANCE.getDurationConstraint());
+
+			elements.put(DurationObservation_Edge, UMLPackage.eINSTANCE.getDurationObservation());
 		}
 		return elements.get(type);
 	}
@@ -364,6 +382,8 @@ public class UMLElementTypes {
 			KNOWN_ELEMENT_TYPES.add(Constraint_ConstrainedElementEdge);
 			KNOWN_ELEMENT_TYPES.add(GeneralOrdering_Edge);
 			KNOWN_ELEMENT_TYPES.add(Constraint_ContextEdge);
+			KNOWN_ELEMENT_TYPES.add(DurationConstraint_Edge);
+			KNOWN_ELEMENT_TYPES.add(DurationObservation_Edge);
 		}
 
 		boolean result = KNOWN_ELEMENT_TYPES.contains(elementType);
@@ -440,6 +460,10 @@ public class UMLElementTypes {
 				return GeneralOrdering_Edge;
 			case ContextLinkEditPart.VISUAL_ID:
 				return Constraint_ContextEdge;
+			case DurationConstraintLinkEditPart.VISUAL_ID:
+				return DurationConstraint_Edge;
+			case DurationObservationLinkEditPart.VISUAL_ID:
+				return DurationObservation_Edge;
 			}
 		}
 		return null;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/providers/UMLViewProvider.java
index a2f057f0d5f..db61662e0bc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/providers/UMLViewProvider.java
@@ -75,6 +75,8 @@ import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ContextLinkEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ContinuationEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ContinuationNameEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DestructionOccurrenceSpecificationEditPart;
+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintLinkEditPart;
+import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationObservationLinkEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.GateEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.GateNameEditPart;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.GeneralOrderingAppliedStereotypeEditPart;
@@ -412,6 +414,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 						preferencesHint);
 			case ContextLinkEditPart.VISUAL_ID:
 				return createConstraint_ContextEdge(containerView, index, persisted, preferencesHint);
+			case DurationConstraintLinkEditPart.VISUAL_ID:
+				return createDurationConstraint_Edge(getSemanticElement(semanticAdapter), containerView, index,
+						persisted, preferencesHint);
+			case DurationObservationLinkEditPart.VISUAL_ID:
+				return createDurationObservation_Edge(getSemanticElement(semanticAdapter), containerView, index,
+						persisted, preferencesHint);
 			}
 		}
 		// can never happen, provided #provides(CreateEdgeViewOperation) is correct
@@ -1163,6 +1171,62 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**
 	 * @generated
 	 */
+	public Edge createDurationConstraint_Edge(EObject domainElement, View containerView, int index, boolean persisted,
+			PreferencesHint preferencesHint) {
+		Connector edge = NotationFactory.eINSTANCE.createConnector();
+		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
+		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();
+		List<RelativeBendpoint> points = new ArrayList<>(2);
+		points.add(new RelativeBendpoint());
+		points.add(new RelativeBendpoint());
+		bendpoints.setPoints(points);
+		edge.setBendpoints(bendpoints);
+		ViewUtil.insertChildView(containerView, edge, index, persisted);
+		edge.setType(UMLVisualIDRegistry.getType(DurationConstraintLinkEditPart.VISUAL_ID));
+		edge.setElement(domainElement);
+		// initializePreferences
+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
+
+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "DurationConstraint");
+		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));
+		// if (routing != null) {
+		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);
+		// }
+
+		return edge;
+	}
+
+	/**
+	 * @generated
+	 */
+	public Edge createDurationObservation_Edge(EObject domainElement, View containerView, int index, boolean persisted,
+			PreferencesHint preferencesHint) {
+		Connector edge = NotationFactory.eINSTANCE.createConnector();
+		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
+		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();
+		List<RelativeBendpoint> points = new ArrayList<>(2);
+		points.add(new RelativeBendpoint());
+		points.add(new RelativeBendpoint());
+		bendpoints.setPoints(points);
+		edge.setBendpoints(bendpoints);
+		ViewUtil.insertChildView(containerView, edge, index, persisted);
+		edge.setType(UMLVisualIDRegistry.getType(DurationObservationLinkEditPart.VISUAL_ID));
+		edge.setElement(domainElement);
+		// initializePreferences
+		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
+
+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "DurationObservation");
+		// org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));
+		// if (routing != null) {
+		// org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);
+		// }
+
+		return edge;
+	}
+
+	/**
+	 * @generated
+	 */
 	protected void stampShortcut(View containerView, Node target) {
 		if (!SequenceDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(containerView))) {
 			EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE.createEAnnotation();
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations b/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations
index cf3f14cc273..870fc17d12e 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations
@@ -1157,4 +1157,5 @@
   <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_VVC0kETXEeimO7ZhVBpjkg" identifier="org.eclipse.papyrus.uml.advice.Interaction" target="org.eclipse.papyrus.uml.Interaction" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.InteractionFragmentContainerEditHelperAdvice"/>
   <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_MTDR4FeqEeiIM8M4fGXWTg" identifier="org.eclipse.papyrus.uml.advice.StateInvariant" target="org.eclipse.papyrus.uml.StateInvariant" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.InteractionFragmentEditHelperAdvice"/>
   <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_M02-cFeqEeiIM8M4fGXWTg" identifier="org.eclipse.papyrus.uml.advice.InteractionUse" target="org.eclipse.papyrus.uml.InteractionUse" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.InteractionFragmentEditHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_zgVlQH4AEeiKffoiPArZXg" identifier="org.eclipse.papyrus.uml.advice.DurationObservation" target="org.eclipse.papyrus.uml.DurationObservation" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.DurationObservationEditHelperAdvice"/>
 </elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations b/plugins/uml/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations
index 48295fcf7c9..96ab693e99e 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations
@@ -1033,6 +1033,10 @@
     <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r7U8ENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DurationConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DurationConstraint"/>
   </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_zZRfUH3REeiyRednYY2ROQ" description="A Duration Constraint, represented as an Edge between its first (duration start) and its second (duration finish) constrained element" identifier="org.eclipse.papyrus.umldi.DurationConstraint_Edge" name="DurationConstraint Edge" hint="DurationConstraint_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_JszLwH3SEeiyRednYY2ROQ" iconPath="/icons/full/obj16/DurationConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DurationConstraint"/>
+  </elementTypeConfigurations>
   <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DurationInterval_Shape" identifier="org.eclipse.papyrus.umldi.DurationInterval_Shape" name="Duration Interval Shape" hint="DurationInterval_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
     <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sAjaUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DurationInterval.gif" bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DurationInterval"/>
@@ -1041,12 +1045,16 @@
     <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sXQDENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DurationObservation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DurationObservation.Event"/>
   </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DurationObservation_Shape_CN" identifier="org.eclipse.papyrus.umldi.DurationObservation_Shape_CN" name="Duration Observation Shape CN" hint="DurationObservation_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r8CGsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DurationObservation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DurationObservation"/>
+  </elementTypeConfigurations>
   <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DurationObservation_Shape" identifier="org.eclipse.papyrus.umldi.DurationObservation_Shape" name="Duration Observation Shape" hint="DurationObservation_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
     <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r4UEUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DurationObservation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DurationObservation"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DurationObservation_Shape_CN" identifier="org.eclipse.papyrus.umldi.DurationObservation_Shape_CN" name="Duration Observation Shape CN" hint="DurationObservation_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r8CGsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DurationObservation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="__qpi0H38EeiKffoiPArZXg" description="A Duration Observation, represented as an Edge between its first (duration start) and its second (duration finish) events" identifier="org.eclipse.papyrus.umldi.DurationObservation_Edge" name="DurationObservation Edge" hint="DurationObservation_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="__qpi0X38EeiKffoiPArZXg" iconPath="/icons/full/obj16/DurationObservation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DurationObservation"/>
   </elementTypeConfigurations>
   <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Duration_Shape" identifier="org.eclipse.papyrus.umldi.Duration_Shape" name="Duration Shape" hint="Duration_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/DurationConstraintEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/DurationConstraintEditHelper.java
index 99c5561be3d..d9c3fc93da1 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/DurationConstraintEditHelper.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/DurationConstraintEditHelper.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2015 CEA LIST and others.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,11 +8,20 @@
  *
  * Contributors:
  *   CEA LIST - Initial API and implementation
- *   
+ *
  *****************************************************************************/
 
 package org.eclipse.papyrus.uml.service.types.helper;
 
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.common.core.command.IdentityCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.papyrus.infra.gmfdiag.common.commands.CreateRelationshipCommandEx;
+import org.eclipse.uml2.uml.DurationConstraint;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Interaction;
 import org.eclipse.uml2.uml.UMLFactory;
 import org.eclipse.uml2.uml.ValueSpecification;
 
@@ -22,5 +31,69 @@ public class DurationConstraintEditHelper extends ConstraintEditHelper {
 	protected ValueSpecification createSpecification() {
 		return UMLFactory.eINSTANCE.createDurationInterval();
 	}
-	
+
+	/**
+	 * <p>
+	 * If the request is a {@link CreateRelationshipRequest}, configure it to indicate that
+	 * the {@link DurationConstraint} should be created as an {@link Interaction#getOwnedRules() ownedRule} in the {@link Interaction}.
+	 * </p>
+	 */
+	@Override
+	public void configureRequest(IEditCommandRequest request) {
+		super.configureRequest(request);
+
+		if (request instanceof CreateRelationshipRequest) {
+			CreateRelationshipRequest req = (CreateRelationshipRequest) request;
+			EObject container = req.getContainer();
+			if (req.getSource() != null && req.getTarget() != null) {
+				// Create in the interaction#ownedRules
+				Interaction interaction = findInteraction(req.getSource());
+				if (interaction != null) {
+					container = interaction;
+				}
+				req.setContainer(container);
+			}
+
+		}
+		super.configureRequest(request);
+	}
+
+	private Interaction findInteraction(EObject source) {
+		if (source instanceof Element) {
+			Element element = (Element) source;
+			while (element != null) {
+				if (element instanceof Interaction) {
+					return (Interaction) element;
+				}
+				element = element.getOwner();
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * <p>
+	 * Unlike other constraints, a DurationConstraint is a Constraint between two elements; so we support
+	 * creation as a Link. In the sequence diagram, this is currently (2018/07) the only supported way.
+	 * In the future, we may add support for DurationConstraints targetting a single element (The UML
+	 * spec supports that; the multiplicity is [1..2]).
+	 * </p>
+	 */
+	@Override
+	protected ICommand getCreateRelationshipCommand(CreateRelationshipRequest req) {
+		EObject source = req.getSource();
+        EObject target = req.getTarget();
+
+        boolean noSourceOrTarget = (source == null || target == null);
+        boolean noSourceAndTarget = (source == null && target == null);
+
+        if (noSourceOrTarget && !noSourceAndTarget) {
+            // The request isn't complete yet. Return the identity command so
+            // that the create relationship gesture is enabled.
+            return IdentityCommand.INSTANCE;
+        }
+
+		return new CreateRelationshipCommandEx(req);
+	}
+
 }
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/DurationObservationEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/DurationObservationEditHelper.java
new file mode 100644
index 00000000000..e26033722b3
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/DurationObservationEditHelper.java
@@ -0,0 +1,87 @@
+/*****************************************************************************
+ * Copyright (c) 2018 CEA LIST, EclipseSource and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   EclipseSource - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.service.types.helper;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.common.core.command.IdentityCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.papyrus.infra.gmfdiag.common.commands.CreateRelationshipCommandEx;
+import org.eclipse.uml2.uml.DurationObservation;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Package;
+
+public class DurationObservationEditHelper extends ElementEditHelper {
+
+	/**
+	 * <p>
+	 * If the request is a {@link CreateRelationshipRequest}, configure it to indicate that
+	 * the {@link DurationObservation} should be created as a {@link Package#getPackagedElements() packagedElement} in the nearest {@link Package}.
+	 * </p>
+	 */
+	@Override
+	public void configureRequest(IEditCommandRequest request) {
+		super.configureRequest(request);
+
+		if (request instanceof CreateRelationshipRequest) {
+			CreateRelationshipRequest req = (CreateRelationshipRequest) request;
+			EObject container = req.getContainer();
+			if (req.getSource() != null && req.getTarget() != null) {
+				// Create in the package#packagedElement
+				Package pkg = findPackage(req.getSource());
+				if (pkg != null) {
+					container = pkg;
+				}
+				req.setContainer(container);
+			}
+
+		}
+		super.configureRequest(request);
+	}
+
+	private Package findPackage(EObject source) {
+		if (source instanceof Element) {
+			Element element = (Element) source;
+			return element.getNearestPackage();
+		}
+		return null;
+	}
+
+	/**
+	 * <p>
+	 * A DurationObservation is an Observation between two named elements; so we support
+	 * creation as a Link. In the sequence diagram, this is currently (2018/07) the only supported way.
+	 * In the future, we may add support for DurationObservations targetting a single named element (The UML
+	 * spec supports that; the multiplicity is [1..2]).
+	 * </p>
+	 */
+	@Override
+	protected ICommand getCreateRelationshipCommand(CreateRelationshipRequest req) {
+		EObject source = req.getSource();
+        EObject target = req.getTarget();
+
+        boolean noSourceOrTarget = (source == null || target == null);
+        boolean noSourceAndTarget = (source == null && target == null);
+
+        if (noSourceOrTarget && !noSourceAndTarget) {
+            // The request isn't complete yet. Return the identity command so
+            // that the create relationship gesture is enabled.
+            return IdentityCommand.INSTANCE;
+        }
+
+		return new CreateRelationshipCommandEx(req);
+	}
+
+}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/LifelineEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/LifelineEditHelper.java
index 580f4a42588..8a66b738c81 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/LifelineEditHelper.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/LifelineEditHelper.java
@@ -58,7 +58,7 @@ public class LifelineEditHelper extends ElementEditHelper {
 
 			IElementType elementtype = createRequest.getElementType();
 
-			if (UMLPackage.eINSTANCE.getExecutionSpecification().isSuperTypeOf(elementtype.getEClass())) {
+			if (elementtype.getEClass() != null && UMLPackage.eINSTANCE.getExecutionSpecification().isSuperTypeOf(elementtype.getEClass())) {
 				Object containerParam = request.getParameters().get(SequenceRequestConstant.INTERACTIONFRAGMENT_CONTAINER);
 				if (containerParam instanceof Interaction || containerParam instanceof InteractionOperand) {
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/DurationConstraintEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/DurationConstraintEditHelperAdvice.java
index 21f0ffaf961..d02eae6ed37 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/DurationConstraintEditHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/DurationConstraintEditHelperAdvice.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
- * Copyright (c) 2017 CEA LIST and others.
- * 
+ * Copyright (c) 2017 - 2018 CEA LIST, EclipseSource and others.
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -9,8 +9,8 @@
  * Contributors:
  *   CEA LIST - Initial API and implementation
  *   Vincent Lorenzo (CEA LIST) - vincent.lorenzo@cea.fr - bug 527259
+ *   EclipseSource - Bug 536488, 536489
  *****************************************************************************/
-
 package org.eclipse.papyrus.uml.service.types.helper.advice;
 
 import org.eclipse.core.commands.ExecutionException;
@@ -23,11 +23,12 @@ import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
 import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;
 import org.eclipse.uml2.uml.Duration;
 import org.eclipse.uml2.uml.DurationConstraint;
 import org.eclipse.uml2.uml.DurationInterval;
+import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.UMLFactory;
 
 /**
@@ -40,7 +41,7 @@ public class DurationConstraintEditHelperAdvice extends AbstractEditHelperAdvice
 	/**
 	 * Add Duration value to the created Duration Interval
 	 * Set name with prefix
-	 * 
+	 *
 	 * @param durationInterval
 	 */
 	private void initDurationInterval(final DurationInterval durationInterval) {
@@ -63,47 +64,80 @@ public class DurationConstraintEditHelperAdvice extends AbstractEditHelperAdvice
 		maxDuration.setExpr(UMLFactory.eINSTANCE.createLiteralInteger());
 	}
 
-
 	/**
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getAfterEditCommand(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)
+	 * <p>
+	 * Configure the new DurationConstraint with
+	 * </p>
 	 *
-	 * @param request
 	 * @return
 	 */
 	@Override
-	public ICommand getAfterEditCommand(final IEditCommandRequest request) {
-
-		ICommand composite = new CompositeCommand("After Edit Command of DurationConstraint");// $NON-NLS-0$
+	protected ICommand getAfterConfigureCommand(ConfigureRequest request) {
+		ICommand composite = new CompositeCommand("After Configure Command of DurationConstraint");// $NON-NLS-0$
+		ICommand afterConfigureCommand = super.getAfterConfigureCommand(request);
+		if (null != afterConfigureCommand && afterConfigureCommand.canExecute()) {
+			composite.compose(afterConfigureCommand);
+		}
 
-		if (null != super.getAfterEditCommand(request) && super.getAfterEditCommand(request).canExecute()) {
-			composite.compose(super.getAfterEditCommand(request));
+		EObject toConfigure = request.getElementToConfigure();
+		if (false == toConfigure instanceof DurationConstraint) {
+			return composite;
 		}
 
+		DurationConstraint constraint = (DurationConstraint) toConfigure;
+
 		// Create the command to initialize Duration Interval in case of Duration Constraint
-		final ICommand command = new AbstractTransactionalCommand(request.getEditingDomain(), "Init DurationConstraint", null) {// $NON-NLS-0$
+		final ICommand initInterval = new AbstractTransactionalCommand(request.getEditingDomain(), "Init DurationConstraint Specification", null) { //$NON-NLS-1$
 
 			@Override
 			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-				if (request instanceof ConfigureRequest) {
-					ConfigureRequest configRequest = (ConfigureRequest) request;
-					EObject element = configRequest.getElementToConfigure();
-					if (element instanceof DurationConstraint) {
-						if (((DurationConstraint) element).getSpecification() instanceof DurationInterval) {
-							// initialize Duration Interval
-							initDurationInterval((DurationInterval) ((DurationConstraint) element).getSpecification());
-						}
-					}
+				if (constraint.getSpecification() instanceof DurationInterval) {
+					// initialize Duration Interval
+					initDurationInterval((DurationInterval) constraint.getSpecification());
 				}
 				return CommandResult.newOKCommandResult();
-
 			}
 		};
 
+		composite.compose(initInterval);
+
+		// Create the command to initialize the ConstrainedElement (Multiplicity [1..2]
+		Element source = getSourceElement(request);
+		Element target = getTargetElement(request);
 
-		if (command.canExecute()) {
-			composite.compose(command);
+		if (source != null && target != null) {
+			final ICommand initConstrainedElements = new AbstractTransactionalCommand(request.getEditingDomain(), "Init DurationConstraint constrained elements", null) {
+
+				@Override
+				protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+					constraint.getConstrainedElements().add(0, source);
+					constraint.getConstrainedElements().add(1, target);
+					return CommandResult.newOKCommandResult();
+				}
+			};
+
+			composite.compose(initConstrainedElements);
 		}
+
 		return composite;
 	}
 
+	protected Element getSourceElement(ConfigureRequest request) {
+		Object paramObject = request.getParameter(CreateRelationshipRequest.SOURCE);
+		if (paramObject instanceof Element) {
+			return (Element) paramObject;
+		}
+
+		return null;
+	}
+
+	protected Element getTargetElement(ConfigureRequest request) {
+		Object paramObject = request.getParameter(CreateRelationshipRequest.TARGET);
+		if (paramObject instanceof Element) {
+			return (Element) paramObject;
+		}
+
+		return null;
+	}
+
 }
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/DurationObservationEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/DurationObservationEditHelperAdvice.java
new file mode 100644
index 00000000000..d47c0bde87d
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/DurationObservationEditHelperAdvice.java
@@ -0,0 +1,84 @@
+/*****************************************************************************
+ * Copyright (c) 2018 CEA LIST, EclipseSource and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   EclipseSource - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.service.types.helper.advice;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
+import org.eclipse.uml2.uml.DurationObservation;
+import org.eclipse.uml2.uml.NamedElement;
+
+public class DurationObservationEditHelperAdvice extends AbstractEditHelperAdvice {
+
+	@Override
+	protected ICommand getAfterConfigureCommand(ConfigureRequest request) {
+		ICommand composite = new CompositeCommand("After Configure Command of DurationObservation");// $NON-NLS-0$
+		ICommand afterConfigureCommand = super.getAfterConfigureCommand(request);
+		if (null != afterConfigureCommand && afterConfigureCommand.canExecute()) {
+			composite.compose(afterConfigureCommand);
+		}
+
+		EObject toConfigure = request.getElementToConfigure();
+		if (false == toConfigure instanceof DurationObservation) {
+			return composite;
+		}
+
+		DurationObservation observation = (DurationObservation) toConfigure;
+
+		// Create the command to initialize the Events (Multiplicity [1..2]
+		NamedElement source = getSourceElement(request);
+		NamedElement target = getTargetElement(request);
+
+		if (source != null && target != null) {
+			final ICommand initConstrainedElements = new AbstractTransactionalCommand(request.getEditingDomain(), "Init DurationObservation events", null) {
+
+				@Override
+				protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+					observation.getEvents().add(0, source);
+					observation.getEvents().add(1, target);
+					return CommandResult.newOKCommandResult();
+				}
+			};
+
+			composite.compose(initConstrainedElements);
+		}
+
+		return composite;
+	}
+
+	protected NamedElement getSourceElement(ConfigureRequest request) {
+		Object paramObject = request.getParameter(CreateRelationshipRequest.SOURCE);
+		if (paramObject instanceof NamedElement) {
+			return (NamedElement) paramObject;
+		}
+
+		return null;
+	}
+
+	protected NamedElement getTargetElement(ConfigureRequest request) {
+		Object paramObject = request.getParameter(CreateRelationshipRequest.TARGET);
+		if (paramObject instanceof NamedElement) {
+			return (NamedElement) paramObject;
+		}
+
+		return null;
+	}
+
+}