Bug 492414 - Fix anomalies in declaration of specialized type

identifiers.

Change-Id: I6ce3b07d87608dea6bfff73fec96582a602bcdfd
Signed-off-by: Sebastien Gabel <sebastien.gabel@esterel-technologies.com>

4 files changed, 90 insertions, 371 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/model/communicationdiagram-notation.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/model/communicationdiagram-notation.elementtypesconfigurations
index eee928a129a..f935c6d265d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/model/communicationdiagram-notation.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/model/communicationdiagram-notation.elementtypesconfigurations
@@ -10,10 +10,19 @@
     name="PapyrusUMLCommunicationDiagram-Notation"

     metamodelNsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation">

   <elementTypeConfigurations

+      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

+      xmi:id="_8pEBQA3lEeagBvXqZ3ul9A"

+      identifier="org.eclipse.papyrus.gmfdiag.common.Diagram"

+      name="GMF::Diagram"

+      editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">

+    <eClass

+        href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.ecore#//Diagram"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations

       xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

       xmi:id="_3JRnoPs1EeWBLbCxWzTFGw"

       identifier="org.eclipse.papyrus.uml.diagram.communication.Diagram_ShortcutShape"

-      name="%metatype.name.Diagram_ShortcutShape"

+      name="Diagram_ShortcutShape"

       hint="Diagram_ShortcutShape">

     <specializedTypesID>org.eclipse.papyrus.gmfdiag.common.Diagram</specializedTypesID>

   </elementTypeConfigurations>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/model/communicationdiagram.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/model/communicationdiagram.elementtypesconfigurations
index cba2f940a62..9f0b8f37634 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/model/communicationdiagram.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/model/communicationdiagram.elementtypesconfigurations
@@ -1,124 +1,39 @@
 <?xml version="1.0" encoding="ASCII"?>

-<elementtypesconfigurations:ElementTypeSetConfiguration

-    xmi:version="2.0"

-    xmlns:xmi="http://www.omg.org/XMI"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"

-    xmi:id="_rWI4YHPzEeSnGJwaJWHCSg"

-    description=""

-    identifier="org.eclipse.papyrus.uml.diagram.communication.elementTypeSet"

-    name="PapyrusUMLCommunicationDiagram"

-    metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">

-  <elementTypeConfigurations

-      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

-      xmi:id="_3JRnoPs1EeWBLbCxWzTFGw"

-      identifier="org.eclipse.papyrus.uml.diagram.communication.Package_CommunicationDiagram"

-      name="%metatype.name.Package_CommunicationDiagram"

-      hint="Package_CommunicationDiagram"

-      editHelperClassName="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.PackageEditHelper">

-    <eClass

-        href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" description="" identifier="org.eclipse.papyrus.uml.diagram.communication.elementTypeSet" name="PapyrusUMLCommunicationDiagram" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_3JRnoPs1EeWBLbCxWzTFGw" identifier="org.eclipse.papyrus.uml.diagram.communication.Package_CommunicationDiagram" name="Package_CommunicationDiagram" hint="Package_CommunicationDiagram" editHelperClassName="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.PackageEditHelper">

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

   </elementTypeConfigurations>

-  <elementTypeConfigurations

-      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

-      xmi:id="_OfI60Ps2EeWBLbCxWzTFGw"

-      identifier="org.eclipse.papyrus.uml.diagram.communication.Interaction_Shape"

-      name="%metatype.name.Interaction_Shape"

-      hint="Interaction_Shape"

-      editHelperClassName="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.InteractionEditHelper">

-    <eClass

-        href="http://www.eclipse.org/uml2/5.0.0/UML#//Interaction"/>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_OfI60Ps2EeWBLbCxWzTFGw" identifier="org.eclipse.papyrus.uml.diagram.communication.Interaction_Shape" name="Interaction_Shape" hint="Interaction_Shape" editHelperClassName="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.InteractionEditHelper">

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Interaction"/>

   </elementTypeConfigurations>

-  <elementTypeConfigurations

-      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

-      xmi:id="_peTP8Ps2EeWBLbCxWzTFGw"

-      identifier="org.eclipse.papyrus.uml.diagram.communication.Lifeline_Shape"

-      name="%metatype.name.Lifeline_Shape"

-      hint="Lifeline_Shape"

-      editHelperClassName="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.LifelineEditHelper">

-    <eClass

-        href="http://www.eclipse.org/uml2/5.0.0/UML#//Lifeline"/>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_peTP8Ps2EeWBLbCxWzTFGw" identifier="org.eclipse.papyrus.uml.diagram.communication.Lifeline_Shape" name="Lifeline_Shape" hint="Lifeline_Shape" editHelperClassName="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.LifelineEditHelper">

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Lifeline"/>

   </elementTypeConfigurations>

-  <elementTypeConfigurations

-      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

-      xmi:id="_eWmGQPs3EeWBLbCxWzTFGw"

-      identifier="org.eclipse.papyrus.uml.diagram.communication.Constraint_Shape"

-      name="%metatype.name.Constraint_Shape"

-      hint="Constraint_Shape"

-      editHelperClassName="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.ConstraintEditHelper">

-    <eClass

-        href="http://www.eclipse.org/uml2/5.0.0/UML#//Constraint"/>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_eWmGQPs3EeWBLbCxWzTFGw" identifier="org.eclipse.papyrus.uml.diagram.communication.Constraint_Shape" name="Constraint_Shape" hint="Constraint_Shape" editHelperClassName="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.ConstraintEditHelper">

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Constraint"/>

   </elementTypeConfigurations>

-  <elementTypeConfigurations

-      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

-      xmi:id="_yiSjgPs3EeWBLbCxWzTFGw"

-      identifier="org.eclipse.papyrus.uml.diagram.communication.Comment_Shape"

-      name="%metatype.name.Comment_Shape"

-      hint="Comment_Shape"

-      editHelperClassName="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.CommentEditHelper">

-    <eClass

-        href="http://www.eclipse.org/uml2/5.0.0/UML#//Comment"/>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_yiSjgPs3EeWBLbCxWzTFGw" identifier="org.eclipse.papyrus.uml.diagram.communication.Comment_Shape" name="Comment_Shape" hint="Comment_Shape" editHelperClassName="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.CommentEditHelper">

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Comment"/>

   </elementTypeConfigurations>

-  <elementTypeConfigurations

-      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

-      xmi:id="_50OgEPs3EeWBLbCxWzTFGw"

-      identifier="org.eclipse.papyrus.uml.diagram.communication.TimeObservation_Shape"

-      name="%metatype.name.TimeObservation_Shape"

-      hint="TimeObservation_Shape"

-      editHelperClassName="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.TimeObservationEditHelper">

-    <eClass

-        href="http://www.eclipse.org/uml2/5.0.0/UML#//TimeObservation"/>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_50OgEPs3EeWBLbCxWzTFGw" identifier="org.eclipse.papyrus.uml.diagram.communication.TimeObservation_Shape" name="TimeObservation_Shape" hint="TimeObservation_Shape" editHelperClassName="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.TimeObservationEditHelper">

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TimeObservation"/>

   </elementTypeConfigurations>

-  <elementTypeConfigurations

-      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

-      xmi:id="_WdaHAPs4EeWBLbCxWzTFGw"

-      identifier="org.eclipse.papyrus.uml.diagram.communication.TimeObservation_Shape"

-      name="%metatype.name.DurationObservation_Shape"

-      hint="DurationObservation_Shape"

-      editHelperClassName="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.DurationObservationEditHelper">

-    <eClass

-        href="http://www.eclipse.org/uml2/5.0.0/UML#//DurationObservation"/>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_WdaHAPs4EeWBLbCxWzTFGw" identifier="org.eclipse.papyrus.uml.diagram.communication.TimeObservation_Shape" name="DurationObservation_Shape" hint="DurationObservation_Shape" editHelperClassName="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.DurationObservationEditHelper">

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DurationObservation"/>

   </elementTypeConfigurations>

-  <elementTypeConfigurations

-      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"

-      xmi:id="_rQgigPs4EeWBLbCxWzTFGw"

-      identifier="org.eclipse.papyrus.uml.diagram.communication.Path_Edge"

-      name="%metatype.name.Path_Edge"

-      hint="Path_Edge"

-      editHelperClassName="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.MessageEditHelper">

-    <eClass

-        href="http://www.eclipse.org/uml2/5.0.0/UML#//Message"/>

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_rQgigPs4EeWBLbCxWzTFGw" identifier="org.eclipse.papyrus.uml.diagram.communication.Path_Edge" name="Path_Edge" hint="Path_Edge" editHelperClassName="org.eclipse.papyrus.uml.diagram.communication.edit.helpers.MessageEditHelper">

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Message"/>

   </elementTypeConfigurations>

-  <elementTypeConfigurations

-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

-      xmi:id="_1I3HsPs4EeWBLbCxWzTFGw"

-      identifier="org.eclipse.papyrus.uml.diagram.communication.Comment_AnnotatedElementEdge"

-      name="%metatype.name.Comment_AnnotatedElementEdge"

-      hint="Comment_AnnotatedElementEdge">

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_1I3HsPs4EeWBLbCxWzTFGw" identifier="org.eclipse.papyrus.uml.diagram.communication.Comment_AnnotatedElementEdge" name="Comment_AnnotatedElementEdge" hint="Comment_AnnotatedElementEdge">

     <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations

-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

-      xmi:id="_M_e-kPs5EeWBLbCxWzTFGw"

-      identifier="org.eclipse.papyrus.uml.diagram.communication.Constraint_ConstrainedElementEdge"

-      name="%metatype.name.Constraint_ConstrainedElementEdge"

-      hint="Constraint_ConstrainedElementEdge">

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_M_e-kPs5EeWBLbCxWzTFGw" identifier="org.eclipse.papyrus.uml.diagram.communication.Constraint_ConstrainedElementEdge" name="Constraint_ConstrainedElementEdge" hint="Constraint_ConstrainedElementEdge">

     <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations

-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

-      xmi:id="_bQzvIPs5EeWBLbCxWzTFGw"

-      identifier="org.eclipse.papyrus.uml.diagram.communication.DurationObservation_EventEdge"

-      name="%metatype.name.DurationObservation_EventEdge"

-      hint="DurationObservation_EventEdge">

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_bQzvIPs5EeWBLbCxWzTFGw" identifier="org.eclipse.papyrus.uml.diagram.communication.DurationObservation_EventEdge" name="DurationObservation_EventEdge" hint="DurationObservation_EventEdge">

     <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

   </elementTypeConfigurations>

-  <elementTypeConfigurations

-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"

-      xmi:id="_k-kN4Ps5EeWBLbCxWzTFGw"

-      identifier="org.eclipse.papyrus.uml.diagram.communication.TimeObservation_EventEdge"

-      name="%metatype.name.TimeObservation_EventEdge"

-      hint="TimeObservation_EventEdge">

+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_k-kN4Ps5EeWBLbCxWzTFGw" identifier="org.eclipse.papyrus.uml.diagram.communication.TimeObservation_EventEdge" name="TimeObservation_EventEdge" hint="TimeObservation_EventEdge">

     <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

   </elementTypeConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/sequencediagram.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/sequencediagram.elementtypesconfigurations
index c0cd61d8b75..436874003e2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/sequencediagram.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/sequencediagram.elementtypesconfigurations
@@ -1,305 +1,97 @@
 <?xml version="1.0" encoding="ASCII"?>
-<elementtypesconfigurations:ElementTypeSetConfiguration
-    xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"
-    xmi:id="_jiZccPyaEeWbo9Y7g2MLdw"
-    identifier="org.eclipse.papyrus.uml.diagram.sequence.elementTypeSet"
-    name="PapyrusUMLSequenceDiagram"
-    metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
-      xmi:id="_jiZccfyaEeWbo9Y7g2MLdw"
-      identifier="org.eclipse.papyrus.uml.diagram.sequence.Package_SequenceDiagram"
-      name="%metatype.name.Package_SequenceDiagram"
-      hint="Package_SequenceDiagram"
-      editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.PackageEditHelper">
-    <eClass
-        href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmi:id="_jiZccPyaEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.sequence.elementTypeSet" name="PapyrusUMLSequenceDiagram" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_jiZccfyaEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.sequence.Package_SequenceDiagram" name="Package_SequenceDiagram" hint="Package_SequenceDiagram" editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.PackageEditHelper">
+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
-      xmi:id="_jiZccvyaEeWbo9Y7g2MLdw"
-      identifier="org.eclipse.papyrus.uml.diagram.sequence.Interaction_Shape"
-      name="%metatype.name.Interaction_Shape"
-      hint="Interaction_Shape"
-      editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.InteractionEditHelper">
-    <eClass
-        href="http://www.eclipse.org/uml2/5.0.0/UML#//Interaction"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_jiZccvyaEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.sequence.Interaction_Shape" name="Interaction_Shape" hint="Interaction_Shape" editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.InteractionEditHelper">
+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Interaction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
-      xmi:id="_jiZcc_yaEeWbo9Y7g2MLdw"
-      identifier="org.eclipse.papyrus.uml.diagram.sequence.ConsiderIgnoreFragment_Shape"
-      name="%metatype.name.ConsiderIgnoreFragment_Shape"
-      hint="ConsiderIgnoreFragment_Shape"
-      editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.ConsiderIgnoreFragmentEditHelper">
-    <eClass
-        href="http://www.eclipse.org/uml2/5.0.0/UML#//ConsiderIgnoreFragment"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_jiZcc_yaEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.sequence.ConsiderIgnoreFragment_Shape" name="ConsiderIgnoreFragment_Shape" hint="ConsiderIgnoreFragment_Shape" editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.ConsiderIgnoreFragmentEditHelper">
+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ConsiderIgnoreFragment"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
-      xmi:id="_jiZcdPyaEeWbo9Y7g2MLdw"
-      identifier="org.eclipse.papyrus.uml.diagram.sequence.CombinedFragment_Shape"
-      name="%metatype.name.CombinedFragment_Shape"
-      hint="CombinedFragment_Shape"
-      editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.CombinedFragmentEditHelper">
-    <eClass
-        href="http://www.eclipse.org/uml2/5.0.0/UML#//CombinedFragment"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_jiZcdPyaEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.sequence.CombinedFragment_Shape" name="CombinedFragment_Shape" hint="CombinedFragment_Shape" editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.CombinedFragmentEditHelper">
+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//CombinedFragment"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
-      xmi:id="_jiZcdfyaEeWbo9Y7g2MLdw"
-      identifier="org.eclipse.papyrus.uml.diagram.sequence.InteractionOperand_Shape"
-      name="%metatype.name.InteractionOperand_Shape"
-      hint="InteractionOperand_Shape"
-      editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.InteractionOperandEditHelper">
-    <eClass
-        href="http://www.eclipse.org/uml2/5.0.0/UML#//InteractionOperand"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_jiZcdfyaEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.sequence.InteractionOperand_Shape" name="InteractionOperand_Shape" hint="InteractionOperand_Shape" editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.InteractionOperandEditHelper">
+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InteractionOperand"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
-      xmi:id="_jiZcdvyaEeWbo9Y7g2MLdw"
-      identifier="org.eclipse.papyrus.uml.diagram.sequence.InteractionUse_Shape"
-      name="%metatype.name.InteractionUse_Shape"
-      hint="InteractionUse_Shape"
-      editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.InteractionUseEditHelper">
-    <eClass
-        href="http://www.eclipse.org/uml2/5.0.0/UML#//InteractionUse"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_jiZcdvyaEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.sequence.InteractionUse_Shape" name="InteractionUse_Shape" hint="InteractionUse_Shape" editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.InteractionUseEditHelper">
+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InteractionUse"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
-      xmi:id="_jiZcd_yaEeWbo9Y7g2MLdw"
-      identifier="org.eclipse.papyrus.uml.diagram.sequence.Continuation_Shape"
-      name="%metatype.name.Continuation_Shape"
-      hint="Continuation_Shape"
-      editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.ContinuationEditHelper">
-    <eClass
-        href="http://www.eclipse.org/uml2/5.0.0/UML#//Continuation"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_jiZcd_yaEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.sequence.Continuation_Shape" name="Continuation_Shape" hint="Continuation_Shape" editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.ContinuationEditHelper">
+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Continuation"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
-      xmi:id="_jiZcePyaEeWbo9Y7g2MLdw"
-      identifier="org.eclipse.papyrus.uml.diagram.sequence.Lifeline_Shape"
-      name="%metatype.name.Lifeline_Shape"
-      hint="Lifeline_Shape"
-      editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.LifelineEditHelper">
-    <eClass
-        href="http://www.eclipse.org/uml2/5.0.0/UML#//Lifeline"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_jiZcePyaEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.sequence.Lifeline_Shape" name="Lifeline_Shape" hint="Lifeline_Shape" editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.LifelineEditHelper">
+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Lifeline"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
-      xmi:id="_jiZcefyaEeWbo9Y7g2MLdw"
-      identifier="org.eclipse.papyrus.uml.diagram.sequence.ActionExecutionSpecification_Shape"
-      name="%metatype.name.ActionExecutionSpecification_Shape"
-      hint="ActionExecutionSpecification_Shape"
-      editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.ActionExecutionSpecificationEditHelper">
-    <eClass
-        href="http://www.eclipse.org/uml2/5.0.0/UML#//ActionExecutionSpecification"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_jiZcefyaEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.sequence.ActionExecutionSpecification_Shape" name="ActionExecutionSpecification_Shape" hint="ActionExecutionSpecification_Shape" editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.ActionExecutionSpecificationEditHelper">
+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ActionExecutionSpecification"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
-      xmi:id="_jiZcevyaEeWbo9Y7g2MLdw"
-      identifier="org.eclipse.papyrus.uml.diagram.sequence.BehaviorExecutionSpecification_Shape"
-      name="%metatype.name.BehaviorExecutionSpecification_Shape"
-      hint="BehaviorExecutionSpecification_Shape"
-      editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.BehaviorExecutionSpecificationEditHelper">
-    <eClass
-        href="http://www.eclipse.org/uml2/5.0.0/UML#//BehaviorExecutionSpecification"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_jiZcevyaEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.sequence.BehaviorExecutionSpecification_Shape" name="BehaviorExecutionSpecification_Shape" hint="BehaviorExecutionSpecification_Shape" editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.BehaviorExecutionSpecificationEditHelper">
+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//BehaviorExecutionSpecification"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
-      xmi:id="_jiZce_yaEeWbo9Y7g2MLdw"
-      identifier="org.eclipse.papyrus.uml.diagram.sequence.StateInvariant_Shape"
-      name="%metatype.name.StateInvariant_Shape"
-      hint="StateInvariant_Shape"
-      editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.StateInvariantEditHelper">
-    <eClass
-        href="http://www.eclipse.org/uml2/5.0.0/UML#//StateInvariant"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_jiZce_yaEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.sequence.StateInvariant_Shape" name="StateInvariant_Shape" hint="StateInvariant_Shape" editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.StateInvariantEditHelper">
+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//StateInvariant"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_jiaDgPyaEeWbo9Y7g2MLdw"
-      identifier="org.eclipse.papyrus.uml.diagram.sequence.CombinedFragment_CoRegionShape"
-      name="%metatype.name.CombinedFragment_CoRegionShape"
-      hint="CombinedFragment_CoRegionShape">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_jiaDgPyaEeWbo9Y7g2MLdw" description="" identifier="org.eclipse.papyrus.uml.diagram.sequence.CombinedFragment_CoRegionShape" name="CombinedFragment_CoRegionShape" hint="CombinedFragment_CoRegionShape">
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.sequence.CombinedFragment_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
-      xmi:id="_jiaDgfyaEeWbo9Y7g2MLdw"
-      identifier="org.eclipse.papyrus.uml.diagram.sequence.TimeConstraint_Shape"
-      name="%metatype.name.TimeConstraint_Shape"
-      hint="TimeConstraint_Shape"
-      editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.TimeConstraintEditHelper">
-    <eClass
-        href="http://www.eclipse.org/uml2/5.0.0/UML#//TimeConstraint"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_jiaDgfyaEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.sequence.TimeConstraint_Shape" name="TimeConstraint_Shape" hint="TimeConstraint_Shape" editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.TimeConstraintEditHelper">
+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TimeConstraint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
-      xmi:id="_jiaDgvyaEeWbo9Y7g2MLdw"
-      identifier="org.eclipse.papyrus.uml.diagram.sequence.TimeObservation_Shape"
-      name="%metatype.name.TimeObservation_Shape"
-      hint="TimeObservation_Shape"
-      editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.TimeObservationEditHelper">
-    <eClass
-        href="http://www.eclipse.org/uml2/5.0.0/UML#//TimeObservation"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_jiaDgvyaEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.sequence.TimeObservation_Shape" name="TimeObservation_Shape" hint="TimeObservation_Shape" editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.TimeObservationEditHelper">
+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TimeObservation"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
-      xmi:id="_jiaDg_yaEeWbo9Y7g2MLdw"
-      identifier="org.eclipse.papyrus.uml.diagram.sequence.DurationConstraint_Shape"
-      name="%metatype.name.DurationConstraint_Shape"
-      hint="DurationConstraint_Shape"
-      editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.DurationConstraintEditHelper">
-    <eClass
-        href="http://www.eclipse.org/uml2/5.0.0/UML#//DurationConstraint"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_jiaDg_yaEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.sequence.DurationConstraint_Shape" name="DurationConstraint_Shape" hint="DurationConstraint_Shape" editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.DurationConstraintEditHelper">
+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DurationConstraint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
-      xmi:id="_jiaDhPyaEeWbo9Y7g2MLdw"
-      identifier="org.eclipse.papyrus.uml.diagram.sequence.DestructionOccurrenceSpecification_Shape"
-      name="%metatype.name.DestructionOccurrenceSpecification_Shape"
-      hint="DestructionOccurrenceSpecification_Shape"
-      editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.DestructionEventEditHelper">
-    <eClass
-        href="http://www.eclipse.org/uml2/5.0.0/UML#//DestructionOccurrenceSpecification"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_jiaDhPyaEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.sequence.DestructionOccurrenceSpecification_Shape" name="DestructionOccurrenceSpecification_Shape" hint="DestructionOccurrenceSpecification_Shape" editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.DestructionEventEditHelper">
+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DestructionOccurrenceSpecification"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
-      xmi:id="_jiaDhfyaEeWbo9Y7g2MLdw"
-      identifier="org.eclipse.papyrus.uml.diagram.sequence.Constraint_Shape"
-      name="%metatype.name.Constraint_Shape"
-      hint="Constraint_Shape"
-      editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.ConstraintEditHelper">
-    <eClass
-        href="http://www.eclipse.org/uml2/5.0.0/UML#//Constraint"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_jiaDhfyaEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.sequence.Constraint_Shape" name="Constraint_Shape" hint="Constraint_Shape" editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.ConstraintEditHelper">
+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Constraint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
-      xmi:id="_jiaDhvyaEeWbo9Y7g2MLdw"
-      identifier="org.eclipse.papyrus.uml.diagram.sequence.Comment_Shape"
-      name="%metatype.name.Comment_Shape"
-      hint="Comment_Shape"
-      editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.CommentEditHelper">
-    <eClass
-        href="http://www.eclipse.org/uml2/5.0.0/UML#//Comment"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_jiaDhvyaEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.sequence.Comment_Shape" name="Comment_Shape" hint="Comment_Shape" editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.CommentEditHelper">
+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Comment"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_jiaDh_yaEeWbo9Y7g2MLdw"
-      identifier="org.eclipse.papyrus.uml.diagram.sequence.DurationConstraint_Shape_CN"
-      name="%metatype.name.DurationConstraint_Shape_CN"
-      hint="DurationConstraint_Shape_CN">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_jiaDh_yaEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.sequence.DurationConstraint_Shape_CN" name="DurationConstraint_Shape_CN" hint="DurationConstraint_Shape_CN">
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.sequence.DurationConstraint_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
-      xmi:id="_jiaDiPyaEeWbo9Y7g2MLdw"
-      identifier="org.eclipse.papyrus.uml.diagram.sequence.DurationObservation_Shape"
-      name="%metatype.name.DurationObservation_Shape"
-      hint="DurationObservation_Shape"
-      editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.DurationObservationEditHelper">
-    <eClass
-        href="http://www.eclipse.org/uml2/5.0.0/UML#//DurationObservation"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_jiaDiPyaEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.sequence.DurationObservation_Shape" name="DurationObservation_Shape" hint="DurationObservation_Shape" editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.DurationObservationEditHelper">
+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DurationObservation"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
-      xmi:id="_jiaDifyaEeWbo9Y7g2MLdw"
-      identifier="org.eclipse.papyrus.uml.diagram.sequence.Message_SynchEdge"
-      name="%metatype.name.Message_SynchEdge"
-      hint="Message_SynchEdge"
-      editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.MessageEditHelper">
-    <eClass
-        href="http://www.eclipse.org/uml2/5.0.0/UML#//Message"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_jiaDifyaEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.sequence.Message_SynchEdge" name="Message_SynchEdge" hint="Message_SynchEdge" editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.MessageEditHelper">
+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Message"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_jiaDivyaEeWbo9Y7g2MLdw"
-      identifier="org.eclipse.papyrus.uml.diagram.sequence.Message_AsynchEdge"
-      name="%metatype.name.Message_AsynchEdge"
-      hint="Message_AsynchEdge">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_jiaDivyaEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.sequence.Message_AsynchEdge" name="Message_AsynchEdge" hint="Message_AsynchEdge">
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.sequence.Message_SynchEdge</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_jiaDi_yaEeWbo9Y7g2MLdw"
-      identifier="org.eclipse.papyrus.uml.diagram.sequence.Message_ReplyEdge"
-      name="%metatype.name.Message_ReplyEdge"
-      hint="Message_ReplyEdge">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_jiaDi_yaEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.sequence.Message_ReplyEdge" name="Message_ReplyEdge" hint="Message_ReplyEdge">
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.sequence.Message_SynchEdge</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_jiaDjPyaEeWbo9Y7g2MLdw"
-      identifier="org.eclipse.papyrus.uml.diagram.sequence.Message_CreateEdge"
-      name="%metatype.name.Message_CreateEdge"
-      hint="Message_CreateEdge">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_jiaDjPyaEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.sequence.Message_CreateEdge" name="Message_CreateEdge" hint="Message_CreateEdge">
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.sequence.Message_SynchEdge</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_jiaDjfyaEeWbo9Y7g2MLdw"
-      identifier="org.eclipse.papyrus.uml.diagram.sequence.Message_DeleteEdge"
-      name="%metatype.name.Message_DeleteEdge"
-      hint="Message_DeleteEdge">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_jiaDjfyaEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.sequence.Message_DeleteEdge" name="Message_DeleteEdge" hint="Message_DeleteEdge">
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.sequence.Message_SynchEdge</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_jiaDjvyaEeWbo9Y7g2MLdw"
-      identifier="org.eclipse.papyrus.uml.diagram.sequence.Message_LostEdge"
-      name="%metatype.name.Message_LostEdge"
-      hint="Message_LostEdge">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_jiaDjvyaEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.sequence.Message_LostEdge" name="Message_LostEdge" hint="Message_LostEdge">
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.sequence.Message_SynchEdge</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_jiaDj_yaEeWbo9Y7g2MLdw"
-      identifier="org.eclipse.papyrus.uml.diagram.sequence.Message_FoundEdge"
-      name="%metatype.name.Message_FoundEdge"
-      hint="Message_FoundEdge">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_jiaDj_yaEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.sequence.Message_FoundEdge" name="Message_FoundEdge" hint="Message_FoundEdge">
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.sequence.Message_SynchEdge</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_jiaDkPyaEeWbo9Y7g2MLdw"
-      identifier="org.eclipse.papyrus.uml.diagram.sequence.Comment_AnnotatedElementEdge"
-      name="%metatype.name.Comment_AnnotatedElementEdge"
-      hint="Comment_AnnotatedElementEdge">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_jiaDkPyaEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.sequence.Comment_AnnotatedElementEdge" name="Comment_AnnotatedElementEdge" hint="Comment_AnnotatedElementEdge">
     <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_jiaDkfyaEeWbo9Y7g2MLdw"
-      identifier="org.eclipse.papyrus.uml.diagram.sequence.Constraint_ConstrainedElementEdge"
-      name="%metatype.name.Constraint_ConstrainedElementEdge"
-      hint="Constraint_ConstrainedElementEdge">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_jiaDkfyaEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.sequence.Constraint_ConstrainedElementEdge" name="Constraint_ConstrainedElementEdge" hint="Constraint_ConstrainedElementEdge">
     <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
-      xmi:id="_jiaDkvyaEeWbo9Y7g2MLdw"
-      identifier="org.eclipse.papyrus.uml.diagram.sequence.GeneralOrdering_Edge"
-      name="%metatype.name.GeneralOrdering_Edge"
-      hint="GeneralOrdering_Edge"
-      editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.GeneralOrderingEditHelper">
-    <eClass
-        href="http://www.eclipse.org/uml2/5.0.0/UML#//GeneralOrdering"/>
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="_jiaDkvyaEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.sequence.GeneralOrdering_Edge" name="GeneralOrdering_Edge" hint="GeneralOrdering_Edge" editHelperClassName="org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.GeneralOrderingEditHelper">
+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//GeneralOrdering"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_jiaDk_yaEeWbo9Y7g2MLdw"
-      identifier="org.eclipse.papyrus.uml.diagram.sequence.Constraint_ContextEdge"
-      name="%metatype.name.Constraint_ContextEdge"
-      hint="Constraint_ContextEdge">
+  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_jiaDk_yaEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.sequence.Constraint_ContextEdge" name="Constraint_ContextEdge" hint="Constraint_ContextEdge">
     <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>
   </elementTypeConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
-      xmi:id="_zpEy0PyfEeWbo9Y7g2MLdw"
-      identifier="org.eclipse.papyrus.uml.diagram.sequence.restoreExecutionEnd"
-      inheritance="all"
-      editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.sequence.RestoreExecutionEndAdvice"/>
+  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_zpEy0PyfEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.sequence.restoreExecutionEnd" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.sequence.RestoreExecutionEndAdvice"/>
 </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 25f9d41f38a..547051316ce 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
@@ -526,15 +526,18 @@
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_eu4bXtx0EeWVxMf7SXAfhg" identifier="org.eclipse.papyrus.umldi.Behavior_DoActivityBehaviorLabel" name="Behavior Do Activity Behavior Label" hint="Behavior_DoActivityBehaviorLabel">
     <iconEntry xmi:id="_sfrmUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Behavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Behavior_InternalBehaviorLabel, org.eclipse.papyrus.uml.Behavior_As_UML::State::doActivity</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.Behavior_InternalBehaviorLabel</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.Behavior_As_UML::State::doActivity</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_eu4bYNx0EeWVxMf7SXAfhg" identifier="org.eclipse.papyrus.umldi.Behavior_EntryBehaviorLabel" name="Behavior Entry Behavior Label" hint="Behavior_EntryBehaviorLabel">
     <iconEntry xmi:id="_sfdj4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Behavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Behavior_InternalBehaviorLabel, org.eclipse.papyrus.uml.Behavior_As_UML::State::entry</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.Behavior_InternalBehaviorLabel</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.Behavior_As_UML::State::entry</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_eu4bYtx0EeWVxMf7SXAfhg" identifier="org.eclipse.papyrus.umldi.Behavior_ExitBehaviorLabel" name="Behavior Exit Behavior Label" hint="Behavior_ExitBehaviorLabel">
     <iconEntry xmi:id="_sfmGwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Behavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umldi.Behavior_InternalBehaviorLabel, org.eclipse.papyrus.uml.Behavior_As_UML::State::exit</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.Behavior_InternalBehaviorLabel</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.uml.Behavior_As_UML::State::exit</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_eu4bZNx0EeWVxMf7SXAfhg" identifier="org.eclipse.papyrus.umldi.Behavior_InternalBehaviorLabel" name="Behavior Internal Behavior Label" hint="Behavior_InternalBehaviorLabel">
     <iconEntry xmi:id="_sfYEUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Behavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>