366527: [All diagram][refactoring] update papyrus to UML2.4

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

31 files changed, 318 insertions, 2056 deletions

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/Environment.xmi b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/Environment.xmi
index 142f3d9ebfa..5cd92ed9cee 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/Environment.xmi
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/Environment.xmi
@@ -15,6 +15,5 @@
   <propertyEditorTypes label="StereotypeDisplayEditor" widgetClass="StereotypeDisplay" namespace="//@namespaces.0" type="Reference"/>

   <propertyEditorTypes label="Stereotype Application Editor" widgetClass="StereotypeApplication" namespace="//@namespaces.0" type="Reference" multiplicity="-1"/>

   <propertyEditorTypes label="Image content Editor" widgetClass="StereotypeImageEditor" namespace="//@namespaces.0"/>

-  <propertyEditorTypes label="Create or Select UML Element" widgetClass="SelectOrCreateDialogPropertyEditor" namespace="//@namespaces.0" type="Reference"/>

   <namespaces prefix="clr-namespace" name="uml" value="org.eclipse.papyrus.uml.properties.widgets"/>

 </environment:Environment>

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx
index a84a2b9dd2b..3bdf395839a 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx
@@ -781,42 +781,18 @@
     <sections name="MultipleBehaviorExecutionSpecification" sectionFile="ui/MultipleBehaviorExecutionSpecification.xwt">

       <widget href="ui/MultipleBehaviorExecutionSpecification.xwt#/"/>

     </sections>

-    <sections name="SingleExecutionEvent" sectionFile="ui/SingleExecutionEvent.xwt">

-      <widget href="ui/SingleExecutionEvent.xwt#/"/>

-    </sections>

-    <sections name="MultipleExecutionEvent" sectionFile="ui/MultipleExecutionEvent.xwt">

-      <widget href="ui/MultipleExecutionEvent.xwt#/"/>

-    </sections>

     <sections name="SingleCreationEvent" sectionFile="ui/SingleCreationEvent.xwt">

       <widget href="ui/SingleCreationEvent.xwt#/"/>

     </sections>

     <sections name="MultipleCreationEvent" sectionFile="ui/MultipleCreationEvent.xwt">

       <widget href="ui/MultipleCreationEvent.xwt#/"/>

     </sections>

-    <sections name="SingleDestructionEvent" sectionFile="ui/SingleDestructionEvent.xwt">

-      <widget href="ui/SingleDestructionEvent.xwt#/"/>

-    </sections>

-    <sections name="MultipleDestructionEvent" sectionFile="ui/MultipleDestructionEvent.xwt">

-      <widget href="ui/MultipleDestructionEvent.xwt#/"/>

-    </sections>

-    <sections name="SingleSendOperationEvent" sectionFile="ui/SingleSendOperationEvent.xwt">

-      <widget href="ui/SingleSendOperationEvent.xwt#/"/>

-    </sections>

-    <sections name="MultipleSendOperationEvent" sectionFile="ui/MultipleSendOperationEvent.xwt">

-      <widget href="ui/MultipleSendOperationEvent.xwt#/"/>

-    </sections>

     <sections name="SingleMessageEvent" sectionFile="ui/SingleMessageEvent.xwt">

       <widget href="ui/SingleMessageEvent.xwt#/"/>

     </sections>

     <sections name="MultipleMessageEvent" sectionFile="ui/MultipleMessageEvent.xwt">

       <widget href="ui/MultipleMessageEvent.xwt#/"/>

     </sections>

-    <sections name="SingleSendSignalEvent" sectionFile="ui/SingleSendSignalEvent.xwt">

-      <widget href="ui/SingleSendSignalEvent.xwt#/"/>

-    </sections>

-    <sections name="MultipleSendSignalEvent" sectionFile="ui/MultipleSendSignalEvent.xwt">

-      <widget href="ui/MultipleSendSignalEvent.xwt#/"/>

-    </sections>

     <sections name="SingleMessageOccurrenceSpecification" sectionFile="ui/SingleMessageOccurrenceSpecification.xwt">

       <widget href="ui/SingleMessageOccurrenceSpecification.xwt#/"/>

     </sections>

@@ -829,18 +805,6 @@
     <sections name="MultipleExecutionOccurrenceSpecification" sectionFile="ui/MultipleExecutionOccurrenceSpecification.xwt">

       <widget href="ui/MultipleExecutionOccurrenceSpecification.xwt#/"/>

     </sections>

-    <sections name="SingleReceiveOperationEvent" sectionFile="ui/SingleReceiveOperationEvent.xwt">

-      <widget href="ui/SingleReceiveOperationEvent.xwt#/"/>

-    </sections>

-    <sections name="MultipleReceiveOperationEvent" sectionFile="ui/MultipleReceiveOperationEvent.xwt">

-      <widget href="ui/MultipleReceiveOperationEvent.xwt#/"/>

-    </sections>

-    <sections name="SingleReceiveSignalEvent" sectionFile="ui/SingleReceiveSignalEvent.xwt">

-      <widget href="ui/SingleReceiveSignalEvent.xwt#/"/>

-    </sections>

-    <sections name="MultipleReceiveSignalEvent" sectionFile="ui/MultipleReceiveSignalEvent.xwt">

-      <widget href="ui/MultipleReceiveSignalEvent.xwt#/"/>

-    </sections>

     <sections name="SingleActor" sectionFile="ui/SingleActor.xwt">

       <widget href="ui/SingleActor.xwt#/"/>

     </sections>

@@ -859,12 +823,6 @@
     <sections name="MultipleChangeEvent" sectionFile="ui/MultipleChangeEvent.xwt">

       <widget href="ui/MultipleChangeEvent.xwt#/"/>

     </sections>

-    <sections name="SingleSignalEvent" sectionFile="ui/SingleSignalEvent.xwt">

-      <widget href="ui/SingleSignalEvent.xwt#/"/>

-    </sections>

-    <sections name="MultipleSignalEvent" sectionFile="ui/MultipleSignalEvent.xwt">

-      <widget href="ui/MultipleSignalEvent.xwt#/"/>

-    </sections>

     <sections name="SingleAnyReceiveEvent" sectionFile="ui/SingleAnyReceiveEvent.xwt">

       <widget href="ui/SingleAnyReceiveEvent.xwt#/"/>

     </sections>

@@ -1402,6 +1360,18 @@
     <sections name="Metaclass" sectionFile="ui/Metaclass.xwt">

       <widget href="ui/Metaclass.xwt#/"/>

     </sections>

+    <sections name="SingleRealLiteral" sectionFile="ui/SingleRealLiteral.xwt">

+      <widget href="ui/SingleRealLiteral.xwt#/"/>

+    </sections>

+    <sections name="MultipleRealLiteral" sectionFile="ui/MultipleRealLiteral.xwt">

+      <widget href="ui/MultipleRealLiteral.xwt#/"/>

+    </sections>

+    <sections name="SingleDestructionOccurrenceSpecification" sectionFile="ui/SingleDestructionOccurrenceSpecification.xwt">

+      <widget href="ui/SingleDestructionOccurrenceSpecification.xwt#/"/>

+    </sections>

+    <sections name="MultipleDestructionOccurrenceSpecification" sectionFile="ui/MultipleDestructionOccurrenceSpecification.xwt">

+      <widget href="ui/MultipleDestructionOccurrenceSpecification.xwt#/"/>

+    </sections>

   </tabs>

   <tabs label="Profile" id="profile" category="org.eclipse.papyrus" priority="50">

     <sections name="SinglePackageProfile" sectionFile="ui/SinglePackageProfile.xwt">

@@ -1423,7 +1393,7 @@
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Element"/>

     </constraints>

   </views>

-  <views name="MultipleElement" sections="//@tabs.0/@sections.461" elementMultiplicity="-1">

+  <views name="MultipleElement" sections="//@tabs.0/@sections.447" elementMultiplicity="-1">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleElement">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Element"/>

@@ -1561,7 +1531,7 @@
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Association"/>

     </constraints>

   </views>

-  <views name="MemberEnd" sections="//@tabs.0/@sections.459"/>

+  <views name="MemberEnd" sections="//@tabs.0/@sections.445"/>

   <views name="SingleClassifier" sections="//@tabs.0/@sections.22" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleClassifier">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

@@ -2990,1207 +2960,1123 @@
       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="BehaviorExecutionSpecification"/>

     </constraints>

   </views>

-  <views name="SingleExecutionEvent" sections="//@tabs.0/@sections.260" automaticContext="true">

-    <constraints xsi:type="contexts:SimpleConstraint" name="isSingleExecutionEvent">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ExecutionEvent"/>

-    </constraints>

-  </views>

-  <views name="MultipleExecutionEvent" sections="//@tabs.0/@sections.261" elementMultiplicity="-1" automaticContext="true">

-    <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleExecutionEvent">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ExecutionEvent"/>

-    </constraints>

-  </views>

-  <views name="SingleCreationEvent" sections="//@tabs.0/@sections.262" automaticContext="true">

+  <views name="SingleCreationEvent" sections="//@tabs.0/@sections.260" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleCreationEvent">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CreationEvent"/>

     </constraints>

   </views>

-  <views name="MultipleCreationEvent" sections="//@tabs.0/@sections.263" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleCreationEvent" sections="//@tabs.0/@sections.261" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleCreationEvent">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CreationEvent"/>

     </constraints>

   </views>

-  <views name="SingleDestructionEvent" sections="//@tabs.0/@sections.264" automaticContext="true">

-    <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDestructionEvent">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DestructionEvent"/>

-    </constraints>

-  </views>

-  <views name="MultipleDestructionEvent" sections="//@tabs.0/@sections.265" elementMultiplicity="-1" automaticContext="true">

-    <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDestructionEvent">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DestructionEvent"/>

-    </constraints>

-  </views>

-  <views name="SingleSendOperationEvent" sections="//@tabs.0/@sections.266" automaticContext="true">

-    <constraints xsi:type="contexts:SimpleConstraint" name="isSingleSendOperationEvent">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="SendOperationEvent"/>

-    </constraints>

-  </views>

-  <views name="MultipleSendOperationEvent" sections="//@tabs.0/@sections.267" elementMultiplicity="-1" automaticContext="true">

-    <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleSendOperationEvent">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="SendOperationEvent"/>

-    </constraints>

-  </views>

-  <views name="SingleMessageEvent" sections="//@tabs.0/@sections.268" automaticContext="true">

+  <views name="SingleMessageEvent" sections="//@tabs.0/@sections.262" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleMessageEvent">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="MessageEvent"/>

     </constraints>

   </views>

-  <views name="MultipleMessageEvent" sections="//@tabs.0/@sections.269" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleMessageEvent" sections="//@tabs.0/@sections.263" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleMessageEvent">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="MessageEvent"/>

     </constraints>

   </views>

-  <views name="SingleSendSignalEvent" sections="//@tabs.0/@sections.270" automaticContext="true">

-    <constraints xsi:type="contexts:SimpleConstraint" name="isSingleSendSignalEvent">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="SendSignalEvent"/>

-    </constraints>

-  </views>

-  <views name="MultipleSendSignalEvent" sections="//@tabs.0/@sections.271" elementMultiplicity="-1" automaticContext="true">

-    <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleSendSignalEvent">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="SendSignalEvent"/>

-    </constraints>

-  </views>

-  <views name="SingleMessageOccurrenceSpecification" sections="//@tabs.0/@sections.272" automaticContext="true">

+  <views name="SingleMessageOccurrenceSpecification" sections="//@tabs.0/@sections.264" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleMessageOccurrenceSpecification">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="MessageOccurrenceSpecification"/>

     </constraints>

   </views>

-  <views name="MultipleMessageOccurrenceSpecification" sections="//@tabs.0/@sections.273" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleMessageOccurrenceSpecification" sections="//@tabs.0/@sections.265" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleMessageOccurrenceSpecification">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="MessageOccurrenceSpecification"/>

     </constraints>

   </views>

-  <views name="SingleExecutionOccurrenceSpecification" sections="//@tabs.0/@sections.274" automaticContext="true">

+  <views name="SingleExecutionOccurrenceSpecification" sections="//@tabs.0/@sections.266" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleExecutionOccurrenceSpecification">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ExecutionOccurrenceSpecification"/>

     </constraints>

   </views>

-  <views name="MultipleExecutionOccurrenceSpecification" sections="//@tabs.0/@sections.275" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleExecutionOccurrenceSpecification" sections="//@tabs.0/@sections.267" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleExecutionOccurrenceSpecification">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ExecutionOccurrenceSpecification"/>

     </constraints>

   </views>

-  <views name="SingleReceiveOperationEvent" sections="//@tabs.0/@sections.276" automaticContext="true">

-    <constraints xsi:type="contexts:SimpleConstraint" name="isSingleReceiveOperationEvent">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReceiveOperationEvent"/>

-    </constraints>

-  </views>

-  <views name="MultipleReceiveOperationEvent" sections="//@tabs.0/@sections.277" elementMultiplicity="-1" automaticContext="true">

-    <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleReceiveOperationEvent">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReceiveOperationEvent"/>

-    </constraints>

-  </views>

-  <views name="SingleReceiveSignalEvent" sections="//@tabs.0/@sections.278" automaticContext="true">

-    <constraints xsi:type="contexts:SimpleConstraint" name="isSingleReceiveSignalEvent">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReceiveSignalEvent"/>

-    </constraints>

-  </views>

-  <views name="MultipleReceiveSignalEvent" sections="//@tabs.0/@sections.279" elementMultiplicity="-1" automaticContext="true">

-    <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleReceiveSignalEvent">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReceiveSignalEvent"/>

-    </constraints>

-  </views>

-  <views name="SingleActor" sections="//@tabs.0/@sections.280" automaticContext="true">

+  <views name="SingleActor" sections="//@tabs.0/@sections.268" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleActor">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Actor"/>

     </constraints>

   </views>

-  <views name="MultipleActor" sections="//@tabs.0/@sections.281" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleActor" sections="//@tabs.0/@sections.269" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleActor">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Actor"/>

     </constraints>

   </views>

-  <views name="SingleCallEvent" sections="//@tabs.0/@sections.282" automaticContext="true">

+  <views name="SingleCallEvent" sections="//@tabs.0/@sections.270" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleCallEvent">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CallEvent"/>

     </constraints>

   </views>

-  <views name="MultipleCallEvent" sections="//@tabs.0/@sections.283" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleCallEvent" sections="//@tabs.0/@sections.271" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleCallEvent">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CallEvent"/>

     </constraints>

   </views>

-  <views name="SingleChangeEvent" sections="//@tabs.0/@sections.284" automaticContext="true">

+  <views name="SingleChangeEvent" sections="//@tabs.0/@sections.272" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleChangeEvent">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ChangeEvent"/>

     </constraints>

   </views>

-  <views name="MultipleChangeEvent" sections="//@tabs.0/@sections.285" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleChangeEvent" sections="//@tabs.0/@sections.273" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleChangeEvent">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ChangeEvent"/>

     </constraints>

   </views>

-  <views name="SingleSignalEvent" sections="//@tabs.0/@sections.286" automaticContext="true">

-    <constraints xsi:type="contexts:SimpleConstraint" name="isSingleSignalEvent">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="SignalEvent"/>

-    </constraints>

-  </views>

-  <views name="MultipleSignalEvent" sections="//@tabs.0/@sections.287" elementMultiplicity="-1" automaticContext="true">

-    <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleSignalEvent">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

-      <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="SignalEvent"/>

-    </constraints>

-  </views>

-  <views name="SingleAnyReceiveEvent" sections="//@tabs.0/@sections.288" automaticContext="true">

+  <views name="SingleAnyReceiveEvent" sections="//@tabs.0/@sections.274" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleAnyReceiveEvent">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="AnyReceiveEvent"/>

     </constraints>

   </views>

-  <views name="MultipleAnyReceiveEvent" sections="//@tabs.0/@sections.289" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleAnyReceiveEvent" sections="//@tabs.0/@sections.275" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleAnyReceiveEvent">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="AnyReceiveEvent"/>

     </constraints>

   </views>

-  <views name="SingleForkNode" sections="//@tabs.0/@sections.290" automaticContext="true">

+  <views name="SingleForkNode" sections="//@tabs.0/@sections.276" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleForkNode">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ForkNode"/>

     </constraints>

   </views>

-  <views name="MultipleForkNode" sections="//@tabs.0/@sections.291" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleForkNode" sections="//@tabs.0/@sections.277" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleForkNode">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ForkNode"/>

     </constraints>

   </views>

-  <views name="SingleFlowFinalNode" sections="//@tabs.0/@sections.292" automaticContext="true">

+  <views name="SingleFlowFinalNode" sections="//@tabs.0/@sections.278" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleFlowFinalNode">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="FlowFinalNode"/>

     </constraints>

   </views>

-  <views name="MultipleFlowFinalNode" sections="//@tabs.0/@sections.293" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleFlowFinalNode" sections="//@tabs.0/@sections.279" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleFlowFinalNode">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="FlowFinalNode"/>

     </constraints>

   </views>

-  <views name="SingleFinalNode" sections="//@tabs.0/@sections.294" automaticContext="true">

+  <views name="SingleFinalNode" sections="//@tabs.0/@sections.280" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleFinalNode">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="FinalNode"/>

     </constraints>

   </views>

-  <views name="MultipleFinalNode" sections="//@tabs.0/@sections.295" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleFinalNode" sections="//@tabs.0/@sections.281" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleFinalNode">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="FinalNode"/>

     </constraints>

   </views>

-  <views name="SingleCentralBufferNode" sections="//@tabs.0/@sections.296" automaticContext="true">

+  <views name="SingleCentralBufferNode" sections="//@tabs.0/@sections.282" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleCentralBufferNode">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CentralBufferNode"/>

     </constraints>

   </views>

-  <views name="MultipleCentralBufferNode" sections="//@tabs.0/@sections.297" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleCentralBufferNode" sections="//@tabs.0/@sections.283" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleCentralBufferNode">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CentralBufferNode"/>

     </constraints>

   </views>

-  <views name="SingleMergeNode" sections="//@tabs.0/@sections.298" automaticContext="true">

+  <views name="SingleMergeNode" sections="//@tabs.0/@sections.284" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleMergeNode">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="MergeNode"/>

     </constraints>

   </views>

-  <views name="MultipleMergeNode" sections="//@tabs.0/@sections.299" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleMergeNode" sections="//@tabs.0/@sections.285" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleMergeNode">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="MergeNode"/>

     </constraints>

   </views>

-  <views name="SingleDecisionNode" sections="//@tabs.0/@sections.300" automaticContext="true">

+  <views name="SingleDecisionNode" sections="//@tabs.0/@sections.286" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDecisionNode">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DecisionNode"/>

     </constraints>

   </views>

-  <views name="MultipleDecisionNode" sections="//@tabs.0/@sections.301" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleDecisionNode" sections="//@tabs.0/@sections.287" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDecisionNode">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DecisionNode"/>

     </constraints>

   </views>

-  <views name="SingleObjectFlow" sections="//@tabs.0/@sections.302" automaticContext="true">

+  <views name="SingleObjectFlow" sections="//@tabs.0/@sections.288" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleObjectFlow">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ObjectFlow"/>

     </constraints>

   </views>

-  <views name="MultipleObjectFlow" sections="//@tabs.0/@sections.303" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleObjectFlow" sections="//@tabs.0/@sections.289" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleObjectFlow">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ObjectFlow"/>

     </constraints>

   </views>

-  <views name="SingleActivityFinalNode" sections="//@tabs.0/@sections.304" automaticContext="true">

+  <views name="SingleActivityFinalNode" sections="//@tabs.0/@sections.290" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleActivityFinalNode">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ActivityFinalNode"/>

     </constraints>

   </views>

-  <views name="MultipleActivityFinalNode" sections="//@tabs.0/@sections.305" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleActivityFinalNode" sections="//@tabs.0/@sections.291" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleActivityFinalNode">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ActivityFinalNode"/>

     </constraints>

   </views>

-  <views name="SingleComponentRealization" sections="//@tabs.0/@sections.306" automaticContext="true">

+  <views name="SingleComponentRealization" sections="//@tabs.0/@sections.292" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleComponentRealization">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ComponentRealization"/>

     </constraints>

   </views>

-  <views name="MultipleComponentRealization" sections="//@tabs.0/@sections.307" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleComponentRealization" sections="//@tabs.0/@sections.293" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleComponentRealization">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ComponentRealization"/>

     </constraints>

   </views>

-  <views name="SingleComponent" sections="//@tabs.0/@sections.308" automaticContext="true">

+  <views name="SingleComponent" sections="//@tabs.0/@sections.294" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleComponent">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Component"/>

     </constraints>

   </views>

-  <views name="MultipleComponent" sections="//@tabs.0/@sections.309" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleComponent" sections="//@tabs.0/@sections.295" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleComponent">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Component"/>

     </constraints>

   </views>

-  <views name="SingleNode" sections="//@tabs.0/@sections.310" automaticContext="true">

+  <views name="SingleNode" sections="//@tabs.0/@sections.296" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleNode">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Node"/>

     </constraints>

   </views>

-  <views name="MultipleNode" sections="//@tabs.0/@sections.311" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleNode" sections="//@tabs.0/@sections.297" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleNode">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Node"/>

     </constraints>

   </views>

-  <views name="SingleCommunicationPath" sections="//@tabs.0/@sections.312" automaticContext="true">

+  <views name="SingleCommunicationPath" sections="//@tabs.0/@sections.298" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleCommunicationPath">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CommunicationPath"/>

     </constraints>

   </views>

-  <views name="MultipleCommunicationPath" sections="//@tabs.0/@sections.313" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleCommunicationPath" sections="//@tabs.0/@sections.299" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleCommunicationPath">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CommunicationPath"/>

     </constraints>

   </views>

-  <views name="SingleDevice" sections="//@tabs.0/@sections.314" automaticContext="true">

+  <views name="SingleDevice" sections="//@tabs.0/@sections.300" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDevice">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Device"/>

     </constraints>

   </views>

-  <views name="MultipleDevice" sections="//@tabs.0/@sections.315" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleDevice" sections="//@tabs.0/@sections.301" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDevice">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Device"/>

     </constraints>

   </views>

-  <views name="SingleExecutionEnvironment" sections="//@tabs.0/@sections.316" automaticContext="true">

+  <views name="SingleExecutionEnvironment" sections="//@tabs.0/@sections.302" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleExecutionEnvironment">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ExecutionEnvironment"/>

     </constraints>

   </views>

-  <views name="MultipleExecutionEnvironment" sections="//@tabs.0/@sections.317" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleExecutionEnvironment" sections="//@tabs.0/@sections.303" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleExecutionEnvironment">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ExecutionEnvironment"/>

     </constraints>

   </views>

-  <views name="SingleCombinedFragment" sections="//@tabs.0/@sections.318" automaticContext="true">

+  <views name="SingleCombinedFragment" sections="//@tabs.0/@sections.304" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleCombinedFragment">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CombinedFragment"/>

     </constraints>

   </views>

-  <views name="MultipleCombinedFragment" sections="//@tabs.0/@sections.319" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleCombinedFragment" sections="//@tabs.0/@sections.305" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleCombinedFragment">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CombinedFragment"/>

     </constraints>

   </views>

-  <views name="SingleContinuation" sections="//@tabs.0/@sections.320" automaticContext="true">

+  <views name="SingleContinuation" sections="//@tabs.0/@sections.306" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleContinuation">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Continuation"/>

     </constraints>

   </views>

-  <views name="MultipleContinuation" sections="//@tabs.0/@sections.321" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleContinuation" sections="//@tabs.0/@sections.307" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleContinuation">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Continuation"/>

     </constraints>

   </views>

-  <views name="SingleConsiderIgnoreFragment" sections="//@tabs.0/@sections.322" automaticContext="true">

+  <views name="SingleConsiderIgnoreFragment" sections="//@tabs.0/@sections.308" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleConsiderIgnoreFragment">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ConsiderIgnoreFragment"/>

     </constraints>

   </views>

-  <views name="MultipleConsiderIgnoreFragment" sections="//@tabs.0/@sections.323" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleConsiderIgnoreFragment" sections="//@tabs.0/@sections.309" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleConsiderIgnoreFragment">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ConsiderIgnoreFragment"/>

     </constraints>

   </views>

-  <views name="SingleCreateObjectAction" sections="//@tabs.0/@sections.324" automaticContext="true">

+  <views name="SingleCreateObjectAction" sections="//@tabs.0/@sections.310" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleCreateObjectAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CreateObjectAction"/>

     </constraints>

   </views>

-  <views name="MultipleCreateObjectAction" sections="//@tabs.0/@sections.325" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleCreateObjectAction" sections="//@tabs.0/@sections.311" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleCreateObjectAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CreateObjectAction"/>

     </constraints>

   </views>

-  <views name="SingleDestroyObjectAction" sections="//@tabs.0/@sections.326" automaticContext="true">

+  <views name="SingleDestroyObjectAction" sections="//@tabs.0/@sections.312" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDestroyObjectAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DestroyObjectAction"/>

     </constraints>

   </views>

-  <views name="MultipleDestroyObjectAction" sections="//@tabs.0/@sections.327" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleDestroyObjectAction" sections="//@tabs.0/@sections.313" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDestroyObjectAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DestroyObjectAction"/>

     </constraints>

   </views>

-  <views name="SingleTestIdentityAction" sections="//@tabs.0/@sections.328" automaticContext="true">

+  <views name="SingleTestIdentityAction" sections="//@tabs.0/@sections.314" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleTestIdentityAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="TestIdentityAction"/>

     </constraints>

   </views>

-  <views name="MultipleTestIdentityAction" sections="//@tabs.0/@sections.329" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleTestIdentityAction" sections="//@tabs.0/@sections.315" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleTestIdentityAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="TestIdentityAction"/>

     </constraints>

   </views>

-  <views name="SingleReadSelfAction" sections="//@tabs.0/@sections.330" automaticContext="true">

+  <views name="SingleReadSelfAction" sections="//@tabs.0/@sections.316" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleReadSelfAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReadSelfAction"/>

     </constraints>

   </views>

-  <views name="MultipleReadSelfAction" sections="//@tabs.0/@sections.331" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleReadSelfAction" sections="//@tabs.0/@sections.317" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleReadSelfAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReadSelfAction"/>

     </constraints>

   </views>

-  <views name="SingleStructuralFeatureAction" sections="//@tabs.0/@sections.332" automaticContext="true">

+  <views name="SingleStructuralFeatureAction" sections="//@tabs.0/@sections.318" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleStructuralFeatureAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="StructuralFeatureAction"/>

     </constraints>

   </views>

-  <views name="MultipleStructuralFeatureAction" sections="//@tabs.0/@sections.333" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleStructuralFeatureAction" sections="//@tabs.0/@sections.319" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleStructuralFeatureAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="StructuralFeatureAction"/>

     </constraints>

   </views>

-  <views name="SingleReadStructuralFeatureAction" sections="//@tabs.0/@sections.334" automaticContext="true">

+  <views name="SingleReadStructuralFeatureAction" sections="//@tabs.0/@sections.320" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleReadStructuralFeatureAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReadStructuralFeatureAction"/>

     </constraints>

   </views>

-  <views name="MultipleReadStructuralFeatureAction" sections="//@tabs.0/@sections.335" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleReadStructuralFeatureAction" sections="//@tabs.0/@sections.321" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleReadStructuralFeatureAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReadStructuralFeatureAction"/>

     </constraints>

   </views>

-  <views name="SingleWriteStructuralFeatureAction" sections="//@tabs.0/@sections.336" automaticContext="true">

+  <views name="SingleWriteStructuralFeatureAction" sections="//@tabs.0/@sections.322" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleWriteStructuralFeatureAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="WriteStructuralFeatureAction"/>

     </constraints>

   </views>

-  <views name="MultipleWriteStructuralFeatureAction" sections="//@tabs.0/@sections.337" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleWriteStructuralFeatureAction" sections="//@tabs.0/@sections.323" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleWriteStructuralFeatureAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="WriteStructuralFeatureAction"/>

     </constraints>

   </views>

-  <views name="SingleClearStructuralFeatureAction" sections="//@tabs.0/@sections.338" automaticContext="true">

+  <views name="SingleClearStructuralFeatureAction" sections="//@tabs.0/@sections.324" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleClearStructuralFeatureAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ClearStructuralFeatureAction"/>

     </constraints>

   </views>

-  <views name="MultipleClearStructuralFeatureAction" sections="//@tabs.0/@sections.339" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleClearStructuralFeatureAction" sections="//@tabs.0/@sections.325" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleClearStructuralFeatureAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ClearStructuralFeatureAction"/>

     </constraints>

   </views>

-  <views name="SingleRemoveStructuralFeatureValueAction" sections="//@tabs.0/@sections.340" automaticContext="true">

+  <views name="SingleRemoveStructuralFeatureValueAction" sections="//@tabs.0/@sections.326" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleRemoveStructuralFeatureValueAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="RemoveStructuralFeatureValueAction"/>

     </constraints>

   </views>

-  <views name="MultipleRemoveStructuralFeatureValueAction" sections="//@tabs.0/@sections.341" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleRemoveStructuralFeatureValueAction" sections="//@tabs.0/@sections.327" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleRemoveStructuralFeatureValueAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="RemoveStructuralFeatureValueAction"/>

     </constraints>

   </views>

-  <views name="SingleAddStructuralFeatureValueAction" sections="//@tabs.0/@sections.342" automaticContext="true">

+  <views name="SingleAddStructuralFeatureValueAction" sections="//@tabs.0/@sections.328" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleAddStructuralFeatureValueAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="AddStructuralFeatureValueAction"/>

     </constraints>

   </views>

-  <views name="MultipleAddStructuralFeatureValueAction" sections="//@tabs.0/@sections.343" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleAddStructuralFeatureValueAction" sections="//@tabs.0/@sections.329" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleAddStructuralFeatureValueAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="AddStructuralFeatureValueAction"/>

     </constraints>

   </views>

-  <views name="SingleLinkAction" sections="//@tabs.0/@sections.344" automaticContext="true">

+  <views name="SingleLinkAction" sections="//@tabs.0/@sections.330" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleLinkAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="LinkAction"/>

     </constraints>

   </views>

-  <views name="MultipleLinkAction" sections="//@tabs.0/@sections.345" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleLinkAction" sections="//@tabs.0/@sections.331" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleLinkAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="LinkAction"/>

     </constraints>

   </views>

-  <views name="SingleLinkEndData" sections="//@tabs.0/@sections.346" automaticContext="true">

+  <views name="SingleLinkEndData" sections="//@tabs.0/@sections.332" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleLinkEndData">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="LinkEndData"/>

     </constraints>

   </views>

-  <views name="SingleQualifierValue" sections="//@tabs.0/@sections.347" automaticContext="true">

+  <views name="SingleQualifierValue" sections="//@tabs.0/@sections.333" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleQualifierValue">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="QualifierValue"/>

     </constraints>

   </views>

-  <views name="SingleReadLinkAction" sections="//@tabs.0/@sections.348" automaticContext="true">

+  <views name="SingleReadLinkAction" sections="//@tabs.0/@sections.334" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleReadLinkAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReadLinkAction"/>

     </constraints>

   </views>

-  <views name="MultipleReadLinkAction" sections="//@tabs.0/@sections.349" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleReadLinkAction" sections="//@tabs.0/@sections.335" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleReadLinkAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReadLinkAction"/>

     </constraints>

   </views>

-  <views name="SingleLinkEndCreationData" sections="//@tabs.0/@sections.350" automaticContext="true">

+  <views name="SingleLinkEndCreationData" sections="//@tabs.0/@sections.336" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleLinkEndCreationData">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="LinkEndCreationData"/>

     </constraints>

   </views>

-  <views name="MultipleLinkEndCreationData" sections="//@tabs.0/@sections.351" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleLinkEndCreationData" sections="//@tabs.0/@sections.337" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleLinkEndCreationData">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="LinkEndCreationData"/>

     </constraints>

   </views>

-  <views name="SingleCreateLinkAction" sections="//@tabs.0/@sections.352" automaticContext="true">

+  <views name="SingleCreateLinkAction" sections="//@tabs.0/@sections.338" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleCreateLinkAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CreateLinkAction"/>

     </constraints>

   </views>

-  <views name="MultipleCreateLinkAction" sections="//@tabs.0/@sections.353" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleCreateLinkAction" sections="//@tabs.0/@sections.339" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleCreateLinkAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CreateLinkAction"/>

     </constraints>

   </views>

-  <views name="SingleWriteLinkAction" sections="//@tabs.0/@sections.354" automaticContext="true">

+  <views name="SingleWriteLinkAction" sections="//@tabs.0/@sections.340" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleWriteLinkAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="WriteLinkAction"/>

     </constraints>

   </views>

-  <views name="MultipleWriteLinkAction" sections="//@tabs.0/@sections.355" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleWriteLinkAction" sections="//@tabs.0/@sections.341" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleWriteLinkAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="WriteLinkAction"/>

     </constraints>

   </views>

-  <views name="SingleDestroyLinkAction" sections="//@tabs.0/@sections.356" automaticContext="true">

+  <views name="SingleDestroyLinkAction" sections="//@tabs.0/@sections.342" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDestroyLinkAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DestroyLinkAction"/>

     </constraints>

   </views>

-  <views name="MultipleDestroyLinkAction" sections="//@tabs.0/@sections.357" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleDestroyLinkAction" sections="//@tabs.0/@sections.343" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDestroyLinkAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DestroyLinkAction"/>

     </constraints>

   </views>

-  <views name="SingleLinkEndDestructionData" sections="//@tabs.0/@sections.358" automaticContext="true">

+  <views name="SingleLinkEndDestructionData" sections="//@tabs.0/@sections.344" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleLinkEndDestructionData">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="LinkEndDestructionData"/>

     </constraints>

   </views>

-  <views name="MultipleLinkEndDestructionData" sections="//@tabs.0/@sections.359" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleLinkEndDestructionData" sections="//@tabs.0/@sections.345" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleLinkEndDestructionData">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="LinkEndDestructionData"/>

     </constraints>

   </views>

-  <views name="SingleClearAssociationAction" sections="//@tabs.0/@sections.360" automaticContext="true">

+  <views name="SingleClearAssociationAction" sections="//@tabs.0/@sections.346" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleClearAssociationAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ClearAssociationAction"/>

     </constraints>

   </views>

-  <views name="MultipleClearAssociationAction" sections="//@tabs.0/@sections.361" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleClearAssociationAction" sections="//@tabs.0/@sections.347" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleClearAssociationAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ClearAssociationAction"/>

     </constraints>

   </views>

-  <views name="SingleBroadcastSignalAction" sections="//@tabs.0/@sections.362" automaticContext="true">

+  <views name="SingleBroadcastSignalAction" sections="//@tabs.0/@sections.348" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleBroadcastSignalAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="BroadcastSignalAction"/>

     </constraints>

   </views>

-  <views name="MultipleBroadcastSignalAction" sections="//@tabs.0/@sections.363" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleBroadcastSignalAction" sections="//@tabs.0/@sections.349" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleBroadcastSignalAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="BroadcastSignalAction"/>

     </constraints>

   </views>

-  <views name="SingleSendObjectAction" sections="//@tabs.0/@sections.364" automaticContext="true">

+  <views name="SingleSendObjectAction" sections="//@tabs.0/@sections.350" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleSendObjectAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="SendObjectAction"/>

     </constraints>

   </views>

-  <views name="MultipleSendObjectAction" sections="//@tabs.0/@sections.365" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleSendObjectAction" sections="//@tabs.0/@sections.351" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleSendObjectAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="SendObjectAction"/>

     </constraints>

   </views>

-  <views name="SingleValueSpecificationAction" sections="//@tabs.0/@sections.366" automaticContext="true">

+  <views name="SingleValueSpecificationAction" sections="//@tabs.0/@sections.352" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleValueSpecificationAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ValueSpecificationAction"/>

     </constraints>

   </views>

-  <views name="MultipleValueSpecificationAction" sections="//@tabs.0/@sections.367" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleValueSpecificationAction" sections="//@tabs.0/@sections.353" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleValueSpecificationAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ValueSpecificationAction"/>

     </constraints>

   </views>

-  <views name="SingleTimeExpression" sections="//@tabs.0/@sections.368" automaticContext="true">

+  <views name="SingleTimeExpression" sections="//@tabs.0/@sections.354" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleTimeExpression">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="TimeExpression"/>

     </constraints>

   </views>

-  <views name="MultipleTimeExpression" sections="//@tabs.0/@sections.369" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleTimeExpression" sections="//@tabs.0/@sections.355" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleTimeExpression">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="TimeExpression"/>

     </constraints>

   </views>

-  <views name="SingleObservation" sections="//@tabs.0/@sections.370" automaticContext="true">

+  <views name="SingleObservation" sections="//@tabs.0/@sections.356" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleObservation">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Observation"/>

     </constraints>

   </views>

-  <views name="MultipleObservation" sections="//@tabs.0/@sections.371" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleObservation" sections="//@tabs.0/@sections.357" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleObservation">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Observation"/>

     </constraints>

   </views>

-  <views name="SingleDuration" sections="//@tabs.0/@sections.372" automaticContext="true">

+  <views name="SingleDuration" sections="//@tabs.0/@sections.358" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDuration">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Duration"/>

     </constraints>

   </views>

-  <views name="MultipleDuration" sections="//@tabs.0/@sections.373" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleDuration" sections="//@tabs.0/@sections.359" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDuration">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Duration"/>

     </constraints>

   </views>

-  <views name="SingleDurationInterval" sections="//@tabs.0/@sections.374" automaticContext="true">

+  <views name="SingleDurationInterval" sections="//@tabs.0/@sections.360" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDurationInterval">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DurationInterval"/>

     </constraints>

   </views>

-  <views name="MultipleDurationInterval" sections="//@tabs.0/@sections.375" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleDurationInterval" sections="//@tabs.0/@sections.361" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDurationInterval">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DurationInterval"/>

     </constraints>

   </views>

-  <views name="SingleInterval" sections="//@tabs.0/@sections.376" automaticContext="true">

+  <views name="SingleInterval" sections="//@tabs.0/@sections.362" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleInterval">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Interval"/>

     </constraints>

   </views>

-  <views name="MultipleInterval" sections="//@tabs.0/@sections.377" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleInterval" sections="//@tabs.0/@sections.363" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleInterval">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Interval"/>

     </constraints>

   </views>

-  <views name="SingleTimeConstraint" sections="//@tabs.0/@sections.378" automaticContext="true">

+  <views name="SingleTimeConstraint" sections="//@tabs.0/@sections.364" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleTimeConstraint">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="TimeConstraint"/>

     </constraints>

   </views>

-  <views name="MultipleTimeConstraint" sections="//@tabs.0/@sections.379" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleTimeConstraint" sections="//@tabs.0/@sections.365" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleTimeConstraint">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="TimeConstraint"/>

     </constraints>

   </views>

-  <views name="SingleIntervalConstraint" sections="//@tabs.0/@sections.380" automaticContext="true">

+  <views name="SingleIntervalConstraint" sections="//@tabs.0/@sections.366" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleIntervalConstraint">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="IntervalConstraint"/>

     </constraints>

   </views>

-  <views name="MultipleIntervalConstraint" sections="//@tabs.0/@sections.381" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleIntervalConstraint" sections="//@tabs.0/@sections.367" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleIntervalConstraint">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="IntervalConstraint"/>

     </constraints>

   </views>

-  <views name="SingleTimeInterval" sections="//@tabs.0/@sections.382" automaticContext="true">

+  <views name="SingleTimeInterval" sections="//@tabs.0/@sections.368" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleTimeInterval">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="TimeInterval"/>

     </constraints>

   </views>

-  <views name="MultipleTimeInterval" sections="//@tabs.0/@sections.383" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleTimeInterval" sections="//@tabs.0/@sections.369" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleTimeInterval">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="TimeInterval"/>

     </constraints>

   </views>

-  <views name="SingleDurationConstraint" sections="//@tabs.0/@sections.384" automaticContext="true">

+  <views name="SingleDurationConstraint" sections="//@tabs.0/@sections.370" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDurationConstraint">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DurationConstraint"/>

     </constraints>

   </views>

-  <views name="MultipleDurationConstraint" sections="//@tabs.0/@sections.385" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleDurationConstraint" sections="//@tabs.0/@sections.371" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDurationConstraint">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DurationConstraint"/>

     </constraints>

   </views>

-  <views name="SingleTimeObservation" sections="//@tabs.0/@sections.386" automaticContext="true">

+  <views name="SingleTimeObservation" sections="//@tabs.0/@sections.372" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleTimeObservation">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="TimeObservation"/>

     </constraints>

   </views>

-  <views name="MultipleTimeObservation" sections="//@tabs.0/@sections.387" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleTimeObservation" sections="//@tabs.0/@sections.373" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleTimeObservation">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="TimeObservation"/>

     </constraints>

   </views>

-  <views name="SingleDurationObservation" sections="//@tabs.0/@sections.388" automaticContext="true">

+  <views name="SingleDurationObservation" sections="//@tabs.0/@sections.374" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDurationObservation">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DurationObservation"/>

     </constraints>

   </views>

-  <views name="MultipleDurationObservation" sections="//@tabs.0/@sections.389" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleDurationObservation" sections="//@tabs.0/@sections.375" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDurationObservation">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DurationObservation"/>

     </constraints>

   </views>

-  <views name="SingleFinalState" sections="//@tabs.0/@sections.390" automaticContext="true">

+  <views name="SingleFinalState" sections="//@tabs.0/@sections.376" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleFinalState">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="FinalState"/>

     </constraints>

   </views>

-  <views name="MultipleFinalState" sections="//@tabs.0/@sections.391" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleFinalState" sections="//@tabs.0/@sections.377" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleFinalState">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="FinalState"/>

     </constraints>

   </views>

-  <views name="SingleTimeEvent" sections="//@tabs.0/@sections.392" automaticContext="true">

+  <views name="SingleTimeEvent" sections="//@tabs.0/@sections.378" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleTimeEvent">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="TimeEvent"/>

     </constraints>

   </views>

-  <views name="MultipleTimeEvent" sections="//@tabs.0/@sections.393" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleTimeEvent" sections="//@tabs.0/@sections.379" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleTimeEvent">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="TimeEvent"/>

     </constraints>

   </views>

-  <views name="SingleVariableAction" sections="//@tabs.0/@sections.394" automaticContext="true">

+  <views name="SingleVariableAction" sections="//@tabs.0/@sections.380" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleVariableAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="VariableAction"/>

     </constraints>

   </views>

-  <views name="MultipleVariableAction" sections="//@tabs.0/@sections.395" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleVariableAction" sections="//@tabs.0/@sections.381" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleVariableAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="VariableAction"/>

     </constraints>

   </views>

-  <views name="SingleReadVariableAction" sections="//@tabs.0/@sections.396" automaticContext="true">

+  <views name="SingleReadVariableAction" sections="//@tabs.0/@sections.382" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleReadVariableAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReadVariableAction"/>

     </constraints>

   </views>

-  <views name="MultipleReadVariableAction" sections="//@tabs.0/@sections.397" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleReadVariableAction" sections="//@tabs.0/@sections.383" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleReadVariableAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReadVariableAction"/>

     </constraints>

   </views>

-  <views name="SingleWriteVariableAction" sections="//@tabs.0/@sections.398" automaticContext="true">

+  <views name="SingleWriteVariableAction" sections="//@tabs.0/@sections.384" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleWriteVariableAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="WriteVariableAction"/>

     </constraints>

   </views>

-  <views name="MultipleWriteVariableAction" sections="//@tabs.0/@sections.399" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleWriteVariableAction" sections="//@tabs.0/@sections.385" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleWriteVariableAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="WriteVariableAction"/>

     </constraints>

   </views>

-  <views name="SingleClearVariableAction" sections="//@tabs.0/@sections.400" automaticContext="true">

+  <views name="SingleClearVariableAction" sections="//@tabs.0/@sections.386" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleClearVariableAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ClearVariableAction"/>

     </constraints>

   </views>

-  <views name="MultipleClearVariableAction" sections="//@tabs.0/@sections.401" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleClearVariableAction" sections="//@tabs.0/@sections.387" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleClearVariableAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ClearVariableAction"/>

     </constraints>

   </views>

-  <views name="SingleAddVariableValueAction" sections="//@tabs.0/@sections.402" automaticContext="true">

+  <views name="SingleAddVariableValueAction" sections="//@tabs.0/@sections.388" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleAddVariableValueAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="AddVariableValueAction"/>

     </constraints>

   </views>

-  <views name="MultipleAddVariableValueAction" sections="//@tabs.0/@sections.403" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleAddVariableValueAction" sections="//@tabs.0/@sections.389" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleAddVariableValueAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="AddVariableValueAction"/>

     </constraints>

   </views>

-  <views name="SingleRemoveVariableValueAction" sections="//@tabs.0/@sections.404" automaticContext="true">

+  <views name="SingleRemoveVariableValueAction" sections="//@tabs.0/@sections.390" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleRemoveVariableValueAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="RemoveVariableValueAction"/>

     </constraints>

   </views>

-  <views name="MultipleRemoveVariableValueAction" sections="//@tabs.0/@sections.405" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleRemoveVariableValueAction" sections="//@tabs.0/@sections.391" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleRemoveVariableValueAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="RemoveVariableValueAction"/>

     </constraints>

   </views>

-  <views name="SingleRaiseExceptionAction" sections="//@tabs.0/@sections.406" automaticContext="true">

+  <views name="SingleRaiseExceptionAction" sections="//@tabs.0/@sections.392" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleRaiseExceptionAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="RaiseExceptionAction"/>

     </constraints>

   </views>

-  <views name="MultipleRaiseExceptionAction" sections="//@tabs.0/@sections.407" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleRaiseExceptionAction" sections="//@tabs.0/@sections.393" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleRaiseExceptionAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="RaiseExceptionAction"/>

     </constraints>

   </views>

-  <views name="SingleActionInputPin" sections="//@tabs.0/@sections.408" automaticContext="true">

+  <views name="SingleActionInputPin" sections="//@tabs.0/@sections.394" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleActionInputPin">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ActionInputPin"/>

     </constraints>

   </views>

-  <views name="MultipleActionInputPin" sections="//@tabs.0/@sections.409" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleActionInputPin" sections="//@tabs.0/@sections.395" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleActionInputPin">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ActionInputPin"/>

     </constraints>

   </views>

-  <views name="SingleInformationItem" sections="//@tabs.0/@sections.410" automaticContext="true">

+  <views name="SingleInformationItem" sections="//@tabs.0/@sections.396" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleInformationItem">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="InformationItem"/>

     </constraints>

   </views>

-  <views name="MultipleInformationItem" sections="//@tabs.0/@sections.411" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleInformationItem" sections="//@tabs.0/@sections.397" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleInformationItem">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="InformationItem"/>

     </constraints>

   </views>

-  <views name="SingleInformationFlow" sections="//@tabs.0/@sections.412" automaticContext="true">

+  <views name="SingleInformationFlow" sections="//@tabs.0/@sections.398" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleInformationFlow">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="InformationFlow"/>

     </constraints>

   </views>

-  <views name="MultipleInformationFlow" sections="//@tabs.0/@sections.413" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleInformationFlow" sections="//@tabs.0/@sections.399" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleInformationFlow">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="InformationFlow"/>

     </constraints>

   </views>

-  <views name="SingleReadExtentAction" sections="//@tabs.0/@sections.414" automaticContext="true">

+  <views name="SingleReadExtentAction" sections="//@tabs.0/@sections.400" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleReadExtentAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReadExtentAction"/>

     </constraints>

   </views>

-  <views name="MultipleReadExtentAction" sections="//@tabs.0/@sections.415" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleReadExtentAction" sections="//@tabs.0/@sections.401" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleReadExtentAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReadExtentAction"/>

     </constraints>

   </views>

-  <views name="SingleReclassifyObjectAction" sections="//@tabs.0/@sections.416" automaticContext="true">

+  <views name="SingleReclassifyObjectAction" sections="//@tabs.0/@sections.402" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleReclassifyObjectAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReclassifyObjectAction"/>

     </constraints>

   </views>

-  <views name="MultipleReclassifyObjectAction" sections="//@tabs.0/@sections.417" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleReclassifyObjectAction" sections="//@tabs.0/@sections.403" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleReclassifyObjectAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReclassifyObjectAction"/>

     </constraints>

   </views>

-  <views name="SingleReadIsClassifiedObjectAction" sections="//@tabs.0/@sections.418" automaticContext="true">

+  <views name="SingleReadIsClassifiedObjectAction" sections="//@tabs.0/@sections.404" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleReadIsClassifiedObjectAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReadIsClassifiedObjectAction"/>

     </constraints>

   </views>

-  <views name="MultipleReadIsClassifiedObjectAction" sections="//@tabs.0/@sections.419" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleReadIsClassifiedObjectAction" sections="//@tabs.0/@sections.405" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleReadIsClassifiedObjectAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReadIsClassifiedObjectAction"/>

     </constraints>

   </views>

-  <views name="SingleStartClassifierBehaviorAction" sections="//@tabs.0/@sections.420" automaticContext="true">

+  <views name="SingleStartClassifierBehaviorAction" sections="//@tabs.0/@sections.406" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleStartClassifierBehaviorAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="StartClassifierBehaviorAction"/>

     </constraints>

   </views>

-  <views name="MultipleStartClassifierBehaviorAction" sections="//@tabs.0/@sections.421" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleStartClassifierBehaviorAction" sections="//@tabs.0/@sections.407" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleStartClassifierBehaviorAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="StartClassifierBehaviorAction"/>

     </constraints>

   </views>

-  <views name="SingleReadLinkObjectEndAction" sections="//@tabs.0/@sections.422" automaticContext="true">

+  <views name="SingleReadLinkObjectEndAction" sections="//@tabs.0/@sections.408" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleReadLinkObjectEndAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReadLinkObjectEndAction"/>

     </constraints>

   </views>

-  <views name="MultipleReadLinkObjectEndAction" sections="//@tabs.0/@sections.423" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleReadLinkObjectEndAction" sections="//@tabs.0/@sections.409" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleReadLinkObjectEndAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReadLinkObjectEndAction"/>

     </constraints>

   </views>

-  <views name="SingleReadLinkObjectEndQualifierAction" sections="//@tabs.0/@sections.424" automaticContext="true">

+  <views name="SingleReadLinkObjectEndQualifierAction" sections="//@tabs.0/@sections.410" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleReadLinkObjectEndQualifierAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReadLinkObjectEndQualifierAction"/>

     </constraints>

   </views>

-  <views name="MultipleReadLinkObjectEndQualifierAction" sections="//@tabs.0/@sections.425" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleReadLinkObjectEndQualifierAction" sections="//@tabs.0/@sections.411" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleReadLinkObjectEndQualifierAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReadLinkObjectEndQualifierAction"/>

     </constraints>

   </views>

-  <views name="SingleCreateLinkObjectAction" sections="//@tabs.0/@sections.426" automaticContext="true">

+  <views name="SingleCreateLinkObjectAction" sections="//@tabs.0/@sections.412" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleCreateLinkObjectAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CreateLinkObjectAction"/>

     </constraints>

   </views>

-  <views name="MultipleCreateLinkObjectAction" sections="//@tabs.0/@sections.427" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleCreateLinkObjectAction" sections="//@tabs.0/@sections.413" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleCreateLinkObjectAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="CreateLinkObjectAction"/>

     </constraints>

   </views>

-  <views name="SingleAcceptEventAction" sections="//@tabs.0/@sections.428" automaticContext="true">

+  <views name="SingleAcceptEventAction" sections="//@tabs.0/@sections.414" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleAcceptEventAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="AcceptEventAction"/>

     </constraints>

   </views>

-  <views name="MultipleAcceptEventAction" sections="//@tabs.0/@sections.429" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleAcceptEventAction" sections="//@tabs.0/@sections.415" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleAcceptEventAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="AcceptEventAction"/>

     </constraints>

   </views>

-  <views name="SingleAcceptCallAction" sections="//@tabs.0/@sections.430" automaticContext="true">

+  <views name="SingleAcceptCallAction" sections="//@tabs.0/@sections.416" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleAcceptCallAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="AcceptCallAction"/>

     </constraints>

   </views>

-  <views name="MultipleAcceptCallAction" sections="//@tabs.0/@sections.431" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleAcceptCallAction" sections="//@tabs.0/@sections.417" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleAcceptCallAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="AcceptCallAction"/>

     </constraints>

   </views>

-  <views name="SingleReplyAction" sections="//@tabs.0/@sections.432" automaticContext="true">

+  <views name="SingleReplyAction" sections="//@tabs.0/@sections.418" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleReplyAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReplyAction"/>

     </constraints>

   </views>

-  <views name="MultipleReplyAction" sections="//@tabs.0/@sections.433" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleReplyAction" sections="//@tabs.0/@sections.419" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleReplyAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReplyAction"/>

     </constraints>

   </views>

-  <views name="SingleUnmarshallAction" sections="//@tabs.0/@sections.434" automaticContext="true">

+  <views name="SingleUnmarshallAction" sections="//@tabs.0/@sections.420" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleUnmarshallAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="UnmarshallAction"/>

     </constraints>

   </views>

-  <views name="MultipleUnmarshallAction" sections="//@tabs.0/@sections.435" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleUnmarshallAction" sections="//@tabs.0/@sections.421" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleUnmarshallAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="UnmarshallAction"/>

     </constraints>

   </views>

-  <views name="SingleReduceAction" sections="//@tabs.0/@sections.436" automaticContext="true">

+  <views name="SingleReduceAction" sections="//@tabs.0/@sections.422" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleReduceAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReduceAction"/>

     </constraints>

   </views>

-  <views name="MultipleReduceAction" sections="//@tabs.0/@sections.437" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleReduceAction" sections="//@tabs.0/@sections.423" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleReduceAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ReduceAction"/>

     </constraints>

   </views>

-  <views name="SingleStartObjectBehaviorAction" sections="//@tabs.0/@sections.438" automaticContext="true">

+  <views name="SingleStartObjectBehaviorAction" sections="//@tabs.0/@sections.424" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleStartObjectBehaviorAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="StartObjectBehaviorAction"/>

     </constraints>

   </views>

-  <views name="MultipleStartObjectBehaviorAction" sections="//@tabs.0/@sections.439" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleStartObjectBehaviorAction" sections="//@tabs.0/@sections.425" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleStartObjectBehaviorAction">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="StartObjectBehaviorAction"/>

     </constraints>

   </views>

-  <views name="SingleJoinNode" sections="//@tabs.0/@sections.440" automaticContext="true">

+  <views name="SingleJoinNode" sections="//@tabs.0/@sections.426" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleJoinNode">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="JoinNode"/>

     </constraints>

   </views>

-  <views name="MultipleJoinNode" sections="//@tabs.0/@sections.441" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleJoinNode" sections="//@tabs.0/@sections.427" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleJoinNode">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="JoinNode"/>

     </constraints>

   </views>

-  <views name="SingleDataStoreNode" sections="//@tabs.0/@sections.442" automaticContext="true">

+  <views name="SingleDataStoreNode" sections="//@tabs.0/@sections.428" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDataStoreNode">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DataStoreNode"/>

     </constraints>

   </views>

-  <views name="MultipleDataStoreNode" sections="//@tabs.0/@sections.443" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleDataStoreNode" sections="//@tabs.0/@sections.429" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDataStoreNode">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="DataStoreNode"/>

     </constraints>

   </views>

-  <views name="SingleConditionalNode" sections="//@tabs.0/@sections.444" automaticContext="true">

+  <views name="SingleConditionalNode" sections="//@tabs.0/@sections.430" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleConditionalNode">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ConditionalNode"/>

     </constraints>

   </views>

-  <views name="MultipleConditionalNode" sections="//@tabs.0/@sections.445" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleConditionalNode" sections="//@tabs.0/@sections.431" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleConditionalNode">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ConditionalNode"/>

     </constraints>

   </views>

-  <views name="SingleClause" sections="//@tabs.0/@sections.446" automaticContext="true">

+  <views name="SingleClause" sections="//@tabs.0/@sections.432" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleClause">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Clause"/>

     </constraints>

   </views>

-  <views name="SingleLoopNode" sections="//@tabs.0/@sections.447" automaticContext="true">

+  <views name="SingleLoopNode" sections="//@tabs.0/@sections.433" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleLoopNode">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="LoopNode"/>

     </constraints>

   </views>

-  <views name="MultipleLoopNode" sections="//@tabs.0/@sections.448" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleLoopNode" sections="//@tabs.0/@sections.434" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleLoopNode">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="LoopNode"/>

     </constraints>

   </views>

-  <views name="SingleExpansionNode" sections="//@tabs.0/@sections.449" automaticContext="true">

+  <views name="SingleExpansionNode" sections="//@tabs.0/@sections.435" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleExpansionNode">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ExpansionNode"/>

     </constraints>

   </views>

-  <views name="MultipleExpansionNode" sections="//@tabs.0/@sections.450" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleExpansionNode" sections="//@tabs.0/@sections.436" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleExpansionNode">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ExpansionNode"/>

     </constraints>

   </views>

-  <views name="SingleExpansionRegion" sections="//@tabs.0/@sections.451" automaticContext="true">

+  <views name="SingleExpansionRegion" sections="//@tabs.0/@sections.437" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleExpansionRegion">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ExpansionRegion"/>

     </constraints>

   </views>

-  <views name="MultipleExpansionRegion" sections="//@tabs.0/@sections.452" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleExpansionRegion" sections="//@tabs.0/@sections.438" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleExpansionRegion">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ExpansionRegion"/>

     </constraints>

   </views>

-  <views name="SingleProtocolTransition" sections="//@tabs.0/@sections.453" automaticContext="true">

+  <views name="SingleProtocolTransition" sections="//@tabs.0/@sections.439" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleProtocolTransition">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ProtocolTransition"/>

     </constraints>

   </views>

-  <views name="MultipleProtocolTransition" sections="//@tabs.0/@sections.454" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleProtocolTransition" sections="//@tabs.0/@sections.440" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleProtocolTransition">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="ProtocolTransition"/>

     </constraints>

   </views>

-  <views name="SingleAssociationClass" sections="//@tabs.0/@sections.455" automaticContext="true">

+  <views name="SingleAssociationClass" sections="//@tabs.0/@sections.441" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleAssociationClass">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="AssociationClass"/>

     </constraints>

   </views>

-  <views name="MultipleAssociationClass" sections="//@tabs.0/@sections.456" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleAssociationClass" sections="//@tabs.0/@sections.442" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleAssociationClass">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="AssociationClass"/>

     </constraints>

   </views>

-  <views name="SingleDependency" sections="//@tabs.0/@sections.457" automaticContext="true">

+  <views name="SingleDependency" sections="//@tabs.0/@sections.443" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDependency">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Dependency"/>

     </constraints>

   </views>

-  <views name="MultipleDependency" sections="//@tabs.0/@sections.458" elementMultiplicity="-1" automaticContext="true">

+  <views name="MultipleDependency" sections="//@tabs.0/@sections.444" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDependency">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Dependency"/>

     </constraints>

   </views>

-  <views name="SingleComment" sections="//@tabs.0/@sections.460">

+  <views name="SingleComment" sections="//@tabs.0/@sections.446">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleComment">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Comment"/>

     </constraints>

   </views>

-  <views name="AsyncMessage" sections="//@tabs.0/@sections.463">

+  <views name="AsyncMessage" sections="//@tabs.0/@sections.449">

     <constraints xsi:type="contexts:CompositeConstraint" name="isAsyncMessage" overriddenConstraints="//@views.232/@constraints.0">

       <constraints name="isMessage">

         <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

@@ -4204,7 +4090,7 @@
       </constraints>

     </constraints>

   </views>

-  <views name="SyncMessage" sections="//@tabs.0/@sections.464">

+  <views name="SyncMessage" sections="//@tabs.0/@sections.450">

     <constraints xsi:type="contexts:CompositeConstraint" name="isSyncMessage" overriddenConstraints="//@views.232/@constraints.0">

       <constraints name="isMessage">

         <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

@@ -4218,7 +4104,7 @@
       </constraints>

     </constraints>

   </views>

-  <views name="ReplyMessage" sections="//@tabs.0/@sections.465">

+  <views name="ReplyMessage" sections="//@tabs.0/@sections.451">

     <constraints xsi:type="contexts:CompositeConstraint" name="isReplyMessage" overriddenConstraints="//@views.232/@constraints.0">

       <constraints name="isMessage">

         <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

@@ -4232,13 +4118,13 @@
       </constraints>

     </constraints>

   </views>

-  <views name="SingleImage" sections="//@tabs.0/@sections.462">

+  <views name="SingleImage" sections="//@tabs.0/@sections.448">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleImage">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="umlClassName" value="Image"/>

     </constraints>

   </views>

-  <views name="Metaclass" sections="//@tabs.0/@sections.466" elementMultiplicity="-1">

+  <views name="Metaclass" sections="//@tabs.0/@sections.452" elementMultiplicity="-1">

     <constraints xsi:type="contexts:CompositeConstraint" name="isMetaclass" overriddenConstraints="//@views.73/@constraints.0 //@views.74/@constraints.0">

       <constraints name="isClass">

         <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/>

@@ -4250,12 +4136,16 @@
       </constraints>

     </constraints>

   </views>

+  <views name="SingleDestructionOccurrenceSpecification" sections="//@tabs.0/@sections.455"/>

+  <views name="MultipleDestructionOccurrenceSpecification" sections="//@tabs.0/@sections.456" elementMultiplicity="-1"/>

+  <views name="SingleRealLiteral" sections="//@tabs.0/@sections.453"/>

+  <views name="MultipleRealLiteral" sections="//@tabs.0/@sections.454" elementMultiplicity="-1"/>

   <dataContexts name="UML" label="UML">

     <elements name="Comment" supertypes="//@dataContexts.0/@elements.1">

       <properties name="body" description="Specifies a string that is the comment."/>

       <properties name="annotatedElement" type="Reference" description="References the Element(s) being commented."/>

     </elements>

-    <elements name="Element" supertypes="//@dataContexts.0/@elements.247">

+    <elements name="Element" supertypes="//@dataContexts.0/@elements.241">

       <properties name="ownedElement" type="Reference" description="The Elements owned by this element."/>

       <properties name="owner" type="Reference" description="The Element that owns this element."/>

       <properties name="ownedComment" type="Reference" description="The Comments owned by this element."/>

@@ -4267,6 +4157,8 @@
       <properties name="nestedPackage" type="Reference" description="References the packaged elements that are Packages."/>

       <properties name="nestingPackage" type="Reference" description="References the Package that owns this Package."/>

       <properties name="profileApplication" type="Reference" description="References the ProfileApplications that indicate which profiles have been applied to the Package."/>

+      <properties name="ownedStereotype" type="Reference" multiplicity="-1"/>

+      <properties name="URI"/>

     </elements>

     <elements name="PackageableElement" supertypes="//@dataContexts.0/@elements.4 //@dataContexts.0/@elements.22"/>

     <elements name="NamedElement" supertypes="//@dataContexts.0/@elements.1">

@@ -4340,6 +4232,7 @@
       <properties name="collaborationUse" type="Reference" description="References the collaboration uses owned by the classifier."/>

       <properties name="ownedUseCase" type="Reference" description="References the use cases owned by this classifier."/>

       <properties name="useCase" type="Reference" description="The set of use cases for which this Classifier is the subject."/>

+      <properties name="isFinalSpecialization" type="Boolean"/>

     </elements>

     <elements name="RedefinableElement" supertypes="//@dataContexts.0/@elements.4">

       <properties name="isLeaf" description="Indicates whether it is possible to further specialize a RedefinableElement. If the value is true, then it is not possible to further specialize the RedefinableElement."/>

@@ -4449,6 +4342,8 @@
       <properties name="association" type="Reference" description="References the association of which this property is a member, if any."/>

       <properties name="qualifier" type="Reference" description="An optional list of ordered qualifier attributes for the end. If the list is empty, then the Association is not qualified."/>

       <properties name="associationEnd" type="Reference" description="Designates the optional association end that owns a qualifier attribute."/>

+      <properties name="interface" type="Reference"/>

+      <properties name="isID" type="Boolean"/>

     </elements>

     <elements name="DeploymentTarget" supertypes="//@dataContexts.0/@elements.4">

       <properties name="deployment" type="Reference" description="The set of Deployments for a DeploymentTarget."/>

@@ -4520,7 +4415,6 @@
       <properties name="ownedBehavior" type="Reference" description="References behavior specifications owned by a classifier."/>

       <properties name="classifierBehavior" type="Reference" description="A behavior specification that specifies the behavior of the classifier itself."/>

       <properties name="interfaceRealization" type="Reference" description="The set of InterfaceRealizations owned by the BehavioredClassifier. Interface realizations reference the Interfaces of which the BehavioredClassifier is an implementation."/>

-      <properties name="ownedTrigger" type="Reference" description="References Trigger descriptions owned by a Classifier."/>

     </elements>

     <elements name="InterfaceRealization" supertypes="//@dataContexts.0/@elements.28">

       <properties name="contract" type="Reference" description="References the Interface specifying the conformance contract."/>

@@ -4583,6 +4477,7 @@
       <properties name="redefinedPort" type="Reference" description="A port may be redefined when its containing classifier is specialized. The redefining port may have additional interfaces to those that are associated with the redefined port or it may replace an interface by one of its subtypes."/>

       <properties name="provided" type="Reference" description="References the interfaces specifying the set of operations and receptions which the classifier offers to its environment, and which it will handle either directly or by forwarding it to a part of its internal structure. This association is derived from the interfaces realized by the type of the port or by the type of the port, if the port was typed by an interface.&#xD;&#xA;"/>

       <properties name="protocol" type="Reference" description="References an optional protocol state machine which describes valid interactions at this interaction point."/>

+      <properties name="isConjugated" type="Boolean"/>

     </elements>

     <elements name="State" supertypes="//@dataContexts.0/@elements.8 //@dataContexts.0/@elements.17 //@dataContexts.0/@elements.54">

       <properties name="isComposite" description="A state with isComposite=true is said to be a composite state. A composite state is a state that contains at least one region."/>

@@ -4644,7 +4539,6 @@
       <properties name="format" description="This indicates the format of the content - which is how the string content should be interpreted. The following values are reserved: SVG, GIF, PNG, JPG, WMF, EMF, BMP.&#xD;&#xA;&#xD;&#xA;In addition the prefix 'MIME: ' is also reserved. This option can be used as an alternative to express the reserved values above, for example &quot;SVG&quot; could instead be expressed as &quot;MIME: image/svg+xml&quot;."/>

     </elements>

     <elements name="Profile" supertypes="//@dataContexts.0/@elements.2">

-      <properties name="ownedStereotype" type="Reference" description="References the Stereotypes that are owned by the Profile."/>

       <properties name="metaclassReference" type="Reference" description="References a metaclass that may be extended."/>

       <properties name="metamodelReference" type="Reference" description="References a package containing (directly or indirectly) metaclasses that may be extended."/>

     </elements>

@@ -4722,6 +4616,7 @@
     </elements>

     <elements name="EnumerationLiteral" supertypes="//@dataContexts.0/@elements.92">

       <properties name="enumeration" type="Reference" description="The Enumeration that this EnumerationLiteral is a member of."/>

+      <properties name="classifier" type="Reference"/>

     </elements>

     <elements name="InstanceSpecification" supertypes="//@dataContexts.0/@elements.36 //@dataContexts.0/@elements.3 //@dataContexts.0/@elements.38">

       <properties name="classifier" type="Reference" description="The classifier or classifiers of the represented instance. If multiple classifiers are specified, the instance is classified by all of them."/>

@@ -4768,6 +4663,7 @@
       <properties name="context" type="Reference" description="The classifier that owns the behavior of which this action is a part."/>

       <properties name="localPrecondition" type="Reference" description="Constraint that must be satisfied when execution is started."/>

       <properties name="localPostcondition" type="Reference" description="Constraint that must be satisfied when executed is completed."/>

+      <properties name="isLocallyReentrant" type="Boolean"/>

     </elements>

     <elements name="ExecutableNode" supertypes="//@dataContexts.0/@elements.107">

       <properties name="handler" type="Reference" description="A set of exception handlers that are examined if an uncaught exception propagates to the outer level of the executable node."/>

@@ -4787,6 +4683,8 @@
       <properties name="edge" type="Reference" description="Edges immediately contained in the structured node."/>

       <properties name="mustIsolate" description="If true, then the actions in the node execute in isolation from actions outside the node."/>

       <properties name="node" type="Reference" description="Nodes immediately contained in the group."/>

+      <properties name="structuredNodeInput" type="Reference" multiplicity="-1"/>

+      <properties name="structuredNodeOutput" type="Reference" multiplicity="-1"/>

     </elements>

     <elements name="ActivityGroup" supertypes="//@dataContexts.0/@elements.1">

       <properties name="subgroup" type="Reference" description="Groups immediately contained in the group."/>

@@ -4921,6 +4819,8 @@
       <properties name="refersTo" type="Reference" description="Refers to the Interaction that defines its meaning"/>

       <properties name="actualGate" type="Reference" description="The actual gates of the InteractionUse"/>

       <properties name="argument" type="Reference" description="The actual arguments of the Interaction"/>

+      <properties name="returnValue" type="Reference"/>

+      <properties name="returnValueRecipient" type="Reference"/>

     </elements>

     <elements name="Gate" supertypes="//@dataContexts.0/@elements.132"/>

     <elements name="GeneralOrdering" supertypes="//@dataContexts.0/@elements.4">

@@ -4929,7 +4829,6 @@
     </elements>

     <elements name="OccurrenceSpecification" supertypes="//@dataContexts.0/@elements.134">

       <properties name="toBefore" type="Reference" description="References the GeneralOrderings that specify EventOcurrences that must occur before this OccurrenceSpecification&#xD;&#xA;"/>

-      <properties name="event" type="Reference" description="References a specification of the occurring event."/>

       <properties name="toAfter" type="Reference" description="References the GeneralOrderings that specify EventOcurrences that must occur after this OccurrenceSpecification&#xD;&#xA;"/>

     </elements>

     <elements name="InteractionOperand" supertypes="//@dataContexts.0/@elements.8 //@dataContexts.0/@elements.134">

@@ -4953,39 +4852,25 @@
     <elements name="BehaviorExecutionSpecification" supertypes="//@dataContexts.0/@elements.143">

       <properties name="behavior" type="Reference" description="Behavior whose execution is occurring."/>

     </elements>

-    <elements name="ExecutionEvent" supertypes="//@dataContexts.0/@elements.57"/>

     <elements name="CreationEvent" supertypes="//@dataContexts.0/@elements.57"/>

-    <elements name="DestructionEvent" supertypes="//@dataContexts.0/@elements.57"/>

-    <elements name="SendOperationEvent" supertypes="//@dataContexts.0/@elements.151">

-      <properties name="operation" type="Reference" description="The operation associated with this event."/>

-    </elements>

     <elements name="MessageEvent" supertypes="//@dataContexts.0/@elements.57"/>

-    <elements name="SendSignalEvent" supertypes="//@dataContexts.0/@elements.151">

-      <properties name="signal" type="Reference" description="The signal associated with this event."/>

-    </elements>

     <elements name="MessageOccurrenceSpecification" supertypes="//@dataContexts.0/@elements.140 //@dataContexts.0/@elements.132"/>

     <elements name="ExecutionOccurrenceSpecification" supertypes="//@dataContexts.0/@elements.140">

-      <properties name="execution" type="Reference" description="References the execution specification describing the execution that is started or finished at this execution event."/>

-    </elements>

-    <elements name="ReceiveOperationEvent" supertypes="//@dataContexts.0/@elements.151">

-      <properties name="operation" type="Reference" description="The operation associated with this event."/>

-    </elements>

-    <elements name="ReceiveSignalEvent" supertypes="//@dataContexts.0/@elements.151">

-      <properties name="signal" type="Reference" description="The signal associated with this event."/>

+      <properties name="execution" type="Reference" multiplicity="2" description="References the execution specification describing the execution that is started or finished at this execution event."/>

     </elements>

     <elements name="Actor" supertypes="//@dataContexts.0/@elements.46"/>

-    <elements name="CallEvent" supertypes="//@dataContexts.0/@elements.151">

+    <elements name="CallEvent" supertypes="//@dataContexts.0/@elements.148">

       <properties name="operation" type="Reference" description="Designates the operation whose invocation raised the call event."/>

     </elements>

     <elements name="ChangeEvent" supertypes="//@dataContexts.0/@elements.57">

       <properties name="changeExpression" type="Reference" description="A Boolean-valued expression that will result in a change event whenever its value changes from false to true."/>

     </elements>

-    <elements name="SignalEvent" supertypes="//@dataContexts.0/@elements.151">

+    <elements name="SignalEvent" supertypes="//@dataContexts.0/@elements.148">

       <properties name="signal" type="Reference" description="The specific signal that is associated with this event."/>

     </elements>

-    <elements name="AnyReceiveEvent" supertypes="//@dataContexts.0/@elements.151"/>

+    <elements name="AnyReceiveEvent" supertypes="//@dataContexts.0/@elements.148"/>

     <elements name="ForkNode" supertypes="//@dataContexts.0/@elements.126"/>

-    <elements name="FlowFinalNode" supertypes="//@dataContexts.0/@elements.164"/>

+    <elements name="FlowFinalNode" supertypes="//@dataContexts.0/@elements.158"/>

     <elements name="FinalNode" supertypes="//@dataContexts.0/@elements.126"/>

     <elements name="CentralBufferNode" supertypes="//@dataContexts.0/@elements.116"/>

     <elements name="MergeNode" supertypes="//@dataContexts.0/@elements.126"/>

@@ -4999,7 +4884,7 @@
       <properties name="transformation" type="Reference" description="Changes or replaces data tokens flowing along edge."/>

       <properties name="selection" type="Reference" description="Selects tokens from a source object node."/>

     </elements>

-    <elements name="ActivityFinalNode" supertypes="//@dataContexts.0/@elements.164"/>

+    <elements name="ActivityFinalNode" supertypes="//@dataContexts.0/@elements.158"/>

     <elements name="ComponentRealization" supertypes="//@dataContexts.0/@elements.28">

       <properties name="abstraction" type="Reference" description="The Component that owns this ComponentRealization and which is implemented by its realizing classifiers."/>

       <properties name="realizingClassifier" type="Reference" description="The classifiers that are involved in the implementation of the Component that owns this Realization."/>

@@ -5015,8 +4900,8 @@
       <properties name="nestedNode" type="Reference" description="The Nodes that are defined (nested) within the Node."/>

     </elements>

     <elements name="CommunicationPath" supertypes="//@dataContexts.0/@elements.15"/>

-    <elements name="Device" supertypes="//@dataContexts.0/@elements.172"/>

-    <elements name="ExecutionEnvironment" supertypes="//@dataContexts.0/@elements.172"/>

+    <elements name="Device" supertypes="//@dataContexts.0/@elements.166"/>

+    <elements name="ExecutionEnvironment" supertypes="//@dataContexts.0/@elements.166"/>

     <elements name="CombinedFragment" supertypes="//@dataContexts.0/@elements.134">

       <properties name="interactionOperator" type="Enumeration" description="Specifies the operation which defines the semantics of this combination of InteractionFragments."/>

       <properties name="operand" type="Reference" description="The set of operands of the combined fragment."/>

@@ -5025,7 +4910,7 @@
     <elements name="Continuation" supertypes="//@dataContexts.0/@elements.134">

       <properties name="setting" description="True: when the Continuation is at the end of the enclosing InteractionFragment and False when it is in the beginning."/>

     </elements>

-    <elements name="ConsiderIgnoreFragment" supertypes="//@dataContexts.0/@elements.176">

+    <elements name="ConsiderIgnoreFragment" supertypes="//@dataContexts.0/@elements.170">

       <properties name="message" type="Reference" description="The set of messages that apply to this fragment"/>

     </elements>

     <elements name="CreateObjectAction" supertypes="//@dataContexts.0/@elements.105">

@@ -5049,21 +4934,21 @@
       <properties name="structuralFeature" type="Reference" description="Structural feature to be read."/>

       <properties name="object" type="Reference" description="Gives the input pin from which the object whose structural feature is to be read or written is obtained.&#xD;&#xA;"/>

     </elements>

-    <elements name="ReadStructuralFeatureAction" supertypes="//@dataContexts.0/@elements.183">

+    <elements name="ReadStructuralFeatureAction" supertypes="//@dataContexts.0/@elements.177">

       <properties name="result" type="Reference" description="Gives the output pin on which the result is put."/>

     </elements>

-    <elements name="WriteStructuralFeatureAction" supertypes="//@dataContexts.0/@elements.183">

+    <elements name="WriteStructuralFeatureAction" supertypes="//@dataContexts.0/@elements.177">

       <properties name="value" type="Reference" description="Value to be added or removed from the structural feature."/>

       <properties name="result" type="Reference" description="Gives the output pin on which the result is put."/>

     </elements>

-    <elements name="ClearStructuralFeatureAction" supertypes="//@dataContexts.0/@elements.183">

+    <elements name="ClearStructuralFeatureAction" supertypes="//@dataContexts.0/@elements.177">

       <properties name="result" type="Reference" description="Gives the output pin on which the result is put."/>

     </elements>

-    <elements name="RemoveStructuralFeatureValueAction" supertypes="//@dataContexts.0/@elements.185">

+    <elements name="RemoveStructuralFeatureValueAction" supertypes="//@dataContexts.0/@elements.179">

       <properties name="isRemoveDuplicates" description="Specifies whether to remove duplicates of the value in nonunique structural features."/>

       <properties name="removeAt" type="Reference" description="Specifies the position of an existing value to remove in ordered nonunique structural features. The type of the pin is UnlimitedNatural, but the value cannot be zero or unlimited."/>

     </elements>

-    <elements name="AddStructuralFeatureValueAction" supertypes="//@dataContexts.0/@elements.185">

+    <elements name="AddStructuralFeatureValueAction" supertypes="//@dataContexts.0/@elements.179">

       <properties name="isReplaceAll" description="Specifies whether existing values of the structural feature of the object should be removed before adding the new value."/>

       <properties name="insertAt" type="Reference" description="Gives the position at which to insert a new value or move an existing value in ordered structural features. The type of the pin is UnlimitedNatural, but the value cannot be zero. This pin is omitted for unordered structural features."/>

     </elements>

@@ -5080,17 +4965,17 @@
       <properties name="qualifier" type="Reference" description="Attribute representing the qualifier for which the value is to be specified."/>

       <properties name="value" type="Reference" description="Input pin from which the specified value for the qualifier is taken."/>

     </elements>

-    <elements name="ReadLinkAction" supertypes="//@dataContexts.0/@elements.189">

+    <elements name="ReadLinkAction" supertypes="//@dataContexts.0/@elements.183">

       <properties name="result" type="Reference" description="The pin on which are put the objects participating in the association at the end not specified by the inputs.&#xD;&#xA;"/>

     </elements>

-    <elements name="LinkEndCreationData" supertypes="//@dataContexts.0/@elements.190">

+    <elements name="LinkEndCreationData" supertypes="//@dataContexts.0/@elements.184">

       <properties name="isReplaceAll" description="Specifies whether the existing links emanating from the object on this end should be destroyed before creating a new link."/>

       <properties name="insertAt" type="Reference" description="Specifies where the new link should be inserted for ordered association ends, or where an existing link should be moved to. The type of the input is UnlimitedNatural, but the input cannot be zero. This pin is omitted for association ends that are not ordered."/>

     </elements>

-    <elements name="CreateLinkAction" supertypes="//@dataContexts.0/@elements.195"/>

-    <elements name="WriteLinkAction" supertypes="//@dataContexts.0/@elements.189"/>

-    <elements name="DestroyLinkAction" supertypes="//@dataContexts.0/@elements.195"/>

-    <elements name="LinkEndDestructionData" supertypes="//@dataContexts.0/@elements.190">

+    <elements name="CreateLinkAction" supertypes="//@dataContexts.0/@elements.189"/>

+    <elements name="WriteLinkAction" supertypes="//@dataContexts.0/@elements.183"/>

+    <elements name="DestroyLinkAction" supertypes="//@dataContexts.0/@elements.189"/>

+    <elements name="LinkEndDestructionData" supertypes="//@dataContexts.0/@elements.184">

       <properties name="isDestroyDuplicates" description="Specifies whether to destroy duplicates of the value in nonunique association ends."/>

       <properties name="destroyAt" type="Reference" description="Specifies the position of an existing link to be destroyed in ordered nonunique association ends. The type of the pin is UnlimitedNatural, but the value cannot be zero or unlimited."/>

     </elements>

@@ -5118,24 +5003,24 @@
       <properties name="expr" type="Reference" description="The value of the Duration."/>

       <properties name="observation" type="Reference" description="Refers to the time and duration observations that are involved in expr."/>

     </elements>

-    <elements name="DurationInterval" supertypes="//@dataContexts.0/@elements.206"/>

+    <elements name="DurationInterval" supertypes="//@dataContexts.0/@elements.200"/>

     <elements name="Interval" supertypes="//@dataContexts.0/@elements.12">

       <properties name="min" type="Reference" description="Refers to the ValueSpecification denoting the minimum value of the range."/>

       <properties name="max" type="Reference" description="Refers to the ValueSpecification denoting the maximum value of the range."/>

     </elements>

-    <elements name="TimeConstraint" supertypes="//@dataContexts.0/@elements.208">

+    <elements name="TimeConstraint" supertypes="//@dataContexts.0/@elements.202">

       <properties name="firstEvent" description="The value of firstEvent is related to constrainedElement. If firstEvent is true, then the corresponding observation event is the first time instant the execution enters constrainedElement. If firstEvent is false, then the corresponding observation event is the last time instant the execution is within constrainedElement."/>

     </elements>

     <elements name="IntervalConstraint" supertypes="//@dataContexts.0/@elements.11"/>

-    <elements name="TimeInterval" supertypes="//@dataContexts.0/@elements.206"/>

-    <elements name="DurationConstraint" supertypes="//@dataContexts.0/@elements.208">

+    <elements name="TimeInterval" supertypes="//@dataContexts.0/@elements.200"/>

+    <elements name="DurationConstraint" supertypes="//@dataContexts.0/@elements.202">

       <properties name="firstEvent" description="The value of firstEvent[i] is related to constrainedElement[i] (where i is 1 or 2). If firstEvent[i] is true, then the corresponding observation event is the first time instant the execution enters constrainedElement[i]. If firstEvent[i] is false, then the corresponding observation event is the last time instant the execution is within constrainedElement[i]. Default value is true applied when constrainedElement[i] refers an element that represents only one time instant."/>

     </elements>

-    <elements name="TimeObservation" supertypes="//@dataContexts.0/@elements.203">

+    <elements name="TimeObservation" supertypes="//@dataContexts.0/@elements.197">

       <properties name="event" type="Reference" description="The observation is determined by the entering or exiting of the event element during execution."/>

       <properties name="firstEvent" description="The value of firstEvent is related to event. If firstEvent is true, then the corresponding observation event is the first time instant the execution enters event. If firstEvent is false, then the corresponding observation event is the time instant the execution exits event."/>

     </elements>

-    <elements name="DurationObservation" supertypes="//@dataContexts.0/@elements.203">

+    <elements name="DurationObservation" supertypes="//@dataContexts.0/@elements.197">

       <properties name="event" type="Reference" description="The observation is determined by the entering or exiting of the event element during execution."/>

       <properties name="firstEvent" description="The value of firstEvent[i] is related to event[i] (where i is 1 or 2). If firstEvent[i] is true, then the corresponding observation event is the first time instant the execution enters event[i]. If firstEvent[i] is false, then the corresponding observation event is the time instant the execution exits event[i]. Default value is true applied when event[i] refers an element that represents only one time instant."/>

     </elements>

@@ -5147,18 +5032,18 @@
     <elements name="VariableAction" supertypes="//@dataContexts.0/@elements.105">

       <properties name="variable" type="Reference" description="Variable to be read."/>

     </elements>

-    <elements name="ReadVariableAction" supertypes="//@dataContexts.0/@elements.215">

+    <elements name="ReadVariableAction" supertypes="//@dataContexts.0/@elements.209">

       <properties name="result" type="Reference" description="Gives the output pin on which the result is put."/>

     </elements>

-    <elements name="WriteVariableAction" supertypes="//@dataContexts.0/@elements.215">

+    <elements name="WriteVariableAction" supertypes="//@dataContexts.0/@elements.209">

       <properties name="value" type="Reference" description="Value to be added or removed from the variable."/>

     </elements>

-    <elements name="ClearVariableAction" supertypes="//@dataContexts.0/@elements.215"/>

-    <elements name="AddVariableValueAction" supertypes="//@dataContexts.0/@elements.217">

+    <elements name="ClearVariableAction" supertypes="//@dataContexts.0/@elements.209"/>

+    <elements name="AddVariableValueAction" supertypes="//@dataContexts.0/@elements.211">

       <properties name="isReplaceAll" description="Specifies whether existing values of the variable should be removed before adding the new value."/>

       <properties name="insertAt" type="Reference" description="Gives the position at which to insert a new value or move an existing value in ordered variables. The types is UnlimitedINatural, but the value cannot be zero. This pin is omitted for unordered variables."/>

     </elements>

-    <elements name="RemoveVariableValueAction" supertypes="//@dataContexts.0/@elements.217">

+    <elements name="RemoveVariableValueAction" supertypes="//@dataContexts.0/@elements.211">

       <properties name="isRemoveDuplicates" description="Specifies whether to remove duplicates of the value in nonunique variables."/>

       <properties name="removeAt" type="Reference" description="Specifies the position of an existing value to remove in ordered nonunique variables. The type of the pin is UnlimitedNatural, but the value cannot be zero or unlimited."/>

     </elements>

@@ -5209,7 +5094,7 @@
       <properties name="result" type="Reference" description="Pin where the result value is placed."/>

       <properties name="qualifier" type="Reference" description="The attribute representing the qualifier to be read."/>

     </elements>

-    <elements name="CreateLinkObjectAction" supertypes="//@dataContexts.0/@elements.194">

+    <elements name="CreateLinkObjectAction" supertypes="//@dataContexts.0/@elements.188">

       <properties name="result" type="Reference" description="Gives the output pin on which the result is put."/>

     </elements>

     <elements name="AcceptEventAction" supertypes="//@dataContexts.0/@elements.105">

@@ -5217,7 +5102,7 @@
       <properties name="result" type="Reference" description="Pins holding the received event objects or their attributes. Event objects may be copied in transmission, so identity might not be preserved."/>

       <properties name="trigger" type="Reference" description="The type of events accepted by the action, as specified by triggers. For triggers with signal events, a signal of the specified type or any subtype of the specified signal type is accepted."/>

     </elements>

-    <elements name="AcceptCallAction" supertypes="//@dataContexts.0/@elements.232">

+    <elements name="AcceptCallAction" supertypes="//@dataContexts.0/@elements.226">

       <properties name="returnInformation" type="Reference" description="Pin where a value is placed containing sufficient information to perform a subsequent reply and return control to the caller. The contents of this value are opaque. It can be passed and copied but it cannot be manipulated by the model."/>

     </elements>

     <elements name="ReplyAction" supertypes="//@dataContexts.0/@elements.105">

@@ -5243,7 +5128,7 @@
       <properties name="isCombineDuplicate" description="Tells whether tokens having objects with the same identity are combined into one by the join."/>

       <properties name="joinSpec" type="Reference" description="A specification giving the conditions under which the join with emit a token. Default is &quot;and&quot;."/>

     </elements>

-    <elements name="DataStoreNode" supertypes="//@dataContexts.0/@elements.165"/>

+    <elements name="DataStoreNode" supertypes="//@dataContexts.0/@elements.159"/>

     <elements name="ConditionalNode" supertypes="//@dataContexts.0/@elements.108">

       <properties name="isDeterminate" description="If true, the modeler asserts that at most one test will succeed."/>

       <properties name="isAssured" description="If true, the modeler asserts that at least one test will succeed."/>

@@ -5251,7 +5136,7 @@
       <properties name="result" type="Reference" description="A list of output pins that constitute the data flow outputs of the conditional."/>

     </elements>

     <elements name="Clause" supertypes="//@dataContexts.0/@elements.1">

-      <properties name="test" type="Reference" description="A nested activity fragment with a designated output pin that specifies the result of the test."/>

+      <properties name="test" type="Reference" multiplicity="-1" description="A nested activity fragment with a designated output pin that specifies the result of the test."/>

       <properties name="body" type="Reference" description="A nested activity fragment that is executed if the test evaluates to true and the clause is chosen over any concurrent clauses that also evaluate to true."/>

       <properties name="predecessorClause" type="Reference" description="A set of clauses whose tests must all evaluate false before the current clause can be tested."/>

       <properties name="successorClause" type="Reference" description="A set of clauses which may not be tested unless the current clause tests false."/>

@@ -5263,7 +5148,7 @@
       <properties name="bodyPart" type="Reference" description="The set of nodes and edges that perform the repetitive computations of the loop. The body section is executed as long as the test section produces a true value."/>

       <properties name="setupPart" type="Reference" description="The set of nodes and edges that initialize values or perform other setup computations for the loop."/>

       <properties name="decider" type="Reference" description="An output pin within the test fragment the value of which is examined after execution of the test to determine whether to execute the loop body."/>

-      <properties name="test" type="Reference" description="The set of nodes, edges, and designated value that compute a Boolean value to determine if another execution of the body will be performed."/>

+      <properties name="test" type="Reference" multiplicity="-1" description="The set of nodes, edges, and designated value that compute a Boolean value to determine if another execution of the body will be performed."/>

       <properties name="result" type="Reference" description="A list of output pins that constitute the data flow output of the entire loop."/>

       <properties name="loopVariable" type="Reference" description="A list of output pins that hold the values of the loop variables during an execution of the loop. When the test fails, the values are movied to the result pins of the loop."/>

       <properties name="bodyOutput" type="Reference" description="A list of output pins within the body fragment the values of which are moved to the loop variable pins after completion of execution of the body, before the next iteration of the loop begins or before the loop exits."/>

@@ -5287,6 +5172,8 @@
     <elements name="EModelElement">

       <properties name="eAnnotations" type="Reference"/>

     </elements>

+    <elements name="LiteralReal" supertypes="//@dataContexts.0/@elements.95"/>

+    <elements name="DestructionOccurrenceSpecification" supertypes="//@dataContexts.0/@elements.149"/>

     <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@modelElementFactories.1"/>

   </dataContexts>

   <dataContexts name="MemberEnd" label="Multiplicity">

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/AsyncMessage.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/AsyncMessage.xwt
index 5b8bac2a353..a153a8b2df9 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/AsyncMessage.xwt
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/AsyncMessage.xwt
@@ -9,7 +9,7 @@
 	<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>

 	<ppe:ReferenceCombo input="{Binding}" property="UML:Message:messageSort"

 		readOnly="true"></ppe:ReferenceCombo>

-	<uml:SelectOrCreateDialogPropertyEditor

-		input="{Binding}" property="UML:Message:signature"></uml:SelectOrCreateDialogPropertyEditor>

+	<uml:ReferenceDialog

+		input="{Binding}" property="UML:Message:signature"></uml:ReferenceDialog>

 	<ppe:MultiReference input="{Binding}" property="UML:Message:argument"></ppe:MultiReference>

 </Composite>
\ No newline at end of file
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/MultipleDestructionEvent.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/MultipleDestructionEvent.xwt
deleted file mode 100644
index 315bddee45b..00000000000
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/MultipleDestructionEvent.xwt
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>

-	</Composite>

-</Composite>
\ No newline at end of file
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/MultipleDestructionOccurrenceSpecification.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/MultipleDestructionOccurrenceSpecification.xwt
new file mode 100644
index 00000000000..251cff52dc3
--- /dev/null
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/MultipleDestructionOccurrenceSpecification.xwt
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<Composite xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:x="http://www.eclipse.org/xwt">

+	<Composite.layout>

+		<ppel:PropertiesLayout></ppel:PropertiesLayout>

+	</Composite.layout>

+</Composite>
\ No newline at end of file
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/MultipleExecutionEvent.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/MultipleExecutionEvent.xwt
deleted file mode 100644
index 9bf200f9cc6..00000000000
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/MultipleExecutionEvent.xwt
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>

-	</Composite>

-</Composite>
\ No newline at end of file
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/MultipleRealLiteral.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/MultipleRealLiteral.xwt
new file mode 100644
index 00000000000..251cff52dc3
--- /dev/null
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/MultipleRealLiteral.xwt
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<Composite xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:x="http://www.eclipse.org/xwt">

+	<Composite.layout>

+		<ppel:PropertiesLayout></ppel:PropertiesLayout>

+	</Composite.layout>

+</Composite>
\ No newline at end of file
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/MultipleReceiveOperationEvent.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/MultipleReceiveOperationEvent.xwt
deleted file mode 100644
index b26c5bd96a7..00000000000
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/MultipleReceiveOperationEvent.xwt
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>

-	</Composite>

-</Composite>
\ No newline at end of file
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/MultipleReceiveSignalEvent.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/MultipleReceiveSignalEvent.xwt
deleted file mode 100644
index cfe663e0395..00000000000
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/MultipleReceiveSignalEvent.xwt
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>

-	</Composite>

-</Composite>
\ No newline at end of file
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/MultipleSendOperationEvent.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/MultipleSendOperationEvent.xwt
deleted file mode 100644
index c5556d89573..00000000000
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/MultipleSendOperationEvent.xwt
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>

-	</Composite>

-</Composite>
\ No newline at end of file
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/MultipleSendSignalEvent.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/MultipleSendSignalEvent.xwt
deleted file mode 100644
index cf81d379327..00000000000
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/MultipleSendSignalEvent.xwt
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>

-	</Composite>

-</Composite>
\ No newline at end of file
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/ReplyMessage.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/ReplyMessage.xwt
index dd46a71df9a..c30a761cb55 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/ReplyMessage.xwt
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/ReplyMessage.xwt
@@ -8,7 +8,7 @@
 	<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>

 	<ppe:ReferenceCombo input="{Binding}" property="UML:Message:messageSort"

 		readOnly="true"></ppe:ReferenceCombo>

-	<uml:SelectOrCreateDialogPropertyEditor

-		input="{Binding}" property="UML:Message:signature"></uml:SelectOrCreateDialogPropertyEditor>

+	<uml:ReferenceDialog

+		input="{Binding}" property="UML:Message:signature"></uml:ReferenceDialog>

 	<ppe:MultiReference input="{Binding}" property="UML:Message:argument"></ppe:MultiReference>

 </Composite>
\ No newline at end of file
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleDestructionEvent.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleDestructionEvent.xwt
deleted file mode 100644
index fd643fc52f0..00000000000
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleDestructionEvent.xwt
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>

-	</Composite>

-</Composite>
\ No newline at end of file
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleDestructionOccurrenceSpecification.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleDestructionOccurrenceSpecification.xwt
new file mode 100644
index 00000000000..49cf1c21ad3
--- /dev/null
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleDestructionOccurrenceSpecification.xwt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<Composite xmlns:x="http://www.eclipse.org/xwt"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

+	<Composite.layout>

+		<ppel:PropertiesLayout></ppel:PropertiesLayout>

+	</Composite.layout>

+</Composite>
\ No newline at end of file
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleExecutionEvent.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleExecutionEvent.xwt
deleted file mode 100644
index 51d0ae20e94..00000000000
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleExecutionEvent.xwt
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>

-	</Composite>

-</Composite>
\ No newline at end of file
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleRealLiteral.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleRealLiteral.xwt
new file mode 100644
index 00000000000..251cff52dc3
--- /dev/null
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleRealLiteral.xwt
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<Composite xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:x="http://www.eclipse.org/xwt">

+	<Composite.layout>

+		<ppel:PropertiesLayout></ppel:PropertiesLayout>

+	</Composite.layout>

+</Composite>
\ No newline at end of file
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleReceiveOperationEvent.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleReceiveOperationEvent.xwt
deleted file mode 100644
index d1994f3c038..00000000000
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleReceiveOperationEvent.xwt
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:uml="clr-namespace:org.eclipse.papyrus.uml.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>

-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>

-		<uml:SelectOrCreateDialogPropertyEditor

-			input="{Binding}" property="UML:ReceiveOperationEvent:operation"></uml:SelectOrCreateDialogPropertyEditor>

-	</Composite>

-</Composite>
\ No newline at end of file
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleReceiveSignalEvent.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleReceiveSignalEvent.xwt
deleted file mode 100644
index 468c8c40cd7..00000000000
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleReceiveSignalEvent.xwt
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="UML:ReceiveSignalEvent:signal"></ppe:ReferenceDialog>

-	</Composite>

-</Composite>
\ No newline at end of file
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleSendOperationEvent.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleSendOperationEvent.xwt
deleted file mode 100644
index d3e62cdbdf0..00000000000
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleSendOperationEvent.xwt
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:uml="clr-namespace:org.eclipse.papyrus.uml.properties.widgets">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout></ppel:PropertiesLayout>

-		</Composite.layout>

-		<uml:SelectOrCreateDialogPropertyEditor

-			input="{Binding}" property="UML:SendOperationEvent:operation"></uml:SelectOrCreateDialogPropertyEditor>

-	</Composite>

-</Composite>
\ No newline at end of file
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleSendSignalEvent.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleSendSignalEvent.xwt
deleted file mode 100644
index cf17146cf87..00000000000
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SingleSendSignalEvent.xwt
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">

-	<Composite.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Composite.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="UML:SendSignalEvent:signal"></ppe:ReferenceDialog>

-	</Composite>

-</Composite>
\ No newline at end of file
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SyncMessage.xwt b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SyncMessage.xwt
index 6958571ff5f..23b97c4f360 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SyncMessage.xwt
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/ui/SyncMessage.xwt
@@ -8,7 +8,7 @@
 	<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>

 	<ppe:ReferenceCombo input="{Binding}" property="UML:Message:messageSort"

 		readOnly="true"></ppe:ReferenceCombo>

-	<uml:SelectOrCreateDialogPropertyEditor

-		input="{Binding}" property="UML:Message:signature"></uml:SelectOrCreateDialogPropertyEditor>

+	<uml:ReferenceDialog

+		input="{Binding}" property="UML:Message:signature"></uml:ReferenceDialog>

 	<ppe:MultiReference input="{Binding}" property="UML:Message:argument"></ppe:MultiReference>

 </Composite>
\ No newline at end of file
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/databinding/SignatureObservableValue.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/databinding/SignatureObservableValue.java
deleted file mode 100644
index 90d7a1034ac..00000000000
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/databinding/SignatureObservableValue.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.uml.properties.databinding;

-

-import org.eclipse.core.databinding.observable.value.AbstractObservableValue;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.uml.tools.utils.MessageUtil;

-import org.eclipse.papyrus.views.properties.Activator;

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

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

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

-

-/**

- * An IObservableValue for editing a message's signature, with

- * either an Operation or a Signal.

- * Relies on the {@link MessageUtil} implementation

- * 

- * @author Camille Letavernier

- */

-//TODO : Change the implementation to be able to retrieve the right Command

-//Implement AggregatedObservable and CommandBasedObservableValue

-public class SignatureObservableValue extends AbstractObservableValue {

-

-	private Message source;

-

-	private TransactionalEditingDomain domain;

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param source

-	 *        The EObject being observed. Should be a Message

-	 * @param domain

-	 *        The editing domain on which the commands will be executed

-	 */

-	public SignatureObservableValue(EObject source, EditingDomain domain) {

-		if(!(source instanceof Message)) {

-			throw new IllegalArgumentException("The source EObject must be a Message"); //$NON-NLS-1$

-		}

-		if(!(domain instanceof TransactionalEditingDomain)) {

-			throw new IllegalArgumentException("The EditingDomain must be a TransactionalEditingDomain"); //$NON-NLS-1$

-		}

-

-		this.source = (Message)source;

-		this.domain = (TransactionalEditingDomain)domain;

-	}

-

-	public Object getValueType() {

-		return EObject.class;

-	}

-

-	@Override

-	protected Object doGetValue() {

-		return source.getSignature();

-	}

-

-	@Override

-	protected void doSetValue(Object value) {

-		try {

-			if(value instanceof Operation) {

-				Operation operation = (Operation)value;

-				MessageUtil.setMessageSignature(source, operation, domain);

-			} else if(value instanceof Signal) {

-				Signal signal = (Signal)value;

-				MessageUtil.setMessageSignature(source, signal, domain);

-			} else if(value == null) {

-				Object currentValue = doGetValue();

-				if(currentValue instanceof Operation) {

-					MessageUtil.setMessageSignature(source, (Operation)null, domain);

-				} else if(currentValue instanceof Signal) {

-					MessageUtil.setMessageSignature(source, (Signal)null, domain);

-				}

-			}

-		} catch (Exception ex) {

-			Activator.log.error(ex);

-		}

-	}

-}

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/messages/Messages.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/messages/Messages.java
index 175e3de0baa..2adb94fc79d 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/messages/Messages.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/messages/Messages.java
@@ -1,6 +1,6 @@
 /*****************************************************************************

  * Copyright (c) 2011 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

@@ -17,8 +17,6 @@ public class Messages extends NLS {
 

 	private static final String BUNDLE_NAME = "org.eclipse.papyrus.uml.properties.messages.messages"; //$NON-NLS-1$

 

-	public static String SelectOrCreateDialog_NothingLabel;

-

 	public static String MultiplicityObservableValue_setMultiplicityCommand;

 

 	public static String ExpressionLanguageFactory_EditLanguage;

@@ -45,15 +43,6 @@ public class Messages extends NLS {
 

 	public static String ProfileApplicationEditor_WaitMessageTitle;

 

-	public static String SelectOrCreateDialog_SelectLabel;

-

-	public static String SelectOrCreateDialog_CreateLabel;

-

-	public static String SelectOrCreateDialog_TypeLabel;

-

-	public static String SelectOrCreateDialog_NameLabel;

-

-	public static String SelectOrCreateDialog_OwnerLabel;

 	static {

 		// initialize resource bundle

 		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/messages/messages.properties b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/messages/messages.properties
index 3ebcb85c1ba..41d612fab83 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/messages/messages.properties
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/messages/messages.properties
@@ -11,9 +11,3 @@ UMLNotationModelElement_DepthNone=None
 ExpressionLanguageFactory_EditLanguage=Edit language

 ExpressionLanguageFactory_LanguageDuplicateError=The same language cannot be used more than once

 ExpressionLanguageFactory_SetNewLanguage=Set the new language

-SelectOrCreateDialog_SelectLabel=Select an existing element

-SelectOrCreateDialog_CreateLabel=Create a new element

-SelectOrCreateDialog_TypeLabel=Type:

-SelectOrCreateDialog_NameLabel=Name:

-SelectOrCreateDialog_OwnerLabel=Owner of the created element

-SelectOrCreateDialog_NothingLabel=No element

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLModelElement.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLModelElement.java
index 82887ac47ad..be2383f6d01 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLModelElement.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLModelElement.java
@@ -1,6 +1,6 @@
 /*****************************************************************************

  * Copyright (c) 2011 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

@@ -46,9 +46,7 @@ import org.eclipse.papyrus.uml.properties.databinding.PapyrusObservableList;
 import org.eclipse.papyrus.uml.properties.databinding.PapyrusObservableValue;

 import org.eclipse.papyrus.uml.properties.databinding.ProvidedInterfaceObservableList;

 import org.eclipse.papyrus.uml.properties.databinding.RequiredInterfaceObservableList;

-import org.eclipse.papyrus.uml.properties.databinding.SignatureObservableValue;

 import org.eclipse.papyrus.uml.properties.providers.InstanceValueContentProvider;

-import org.eclipse.papyrus.uml.properties.providers.SignatureContentProvider;

 import org.eclipse.papyrus.uml.properties.providers.UMLLabelProvider;

 import org.eclipse.papyrus.uml.tools.utils.PackageUtil;

 import org.eclipse.papyrus.views.properties.modelelement.EMFModelElement;

@@ -68,16 +66,16 @@ import org.eclipse.uml2.uml.UMLPackage;
 

 /**

  * A ModelElement representing a UML Element

- * 

+ *

  * @author Camille Letavernier

- * 

+ *

  */

 public class UMLModelElement extends EMFModelElement {

 

 	/**

-	 * 

+	 *

 	 * Constructor.

-	 * 

+	 *

 	 * @param source

 	 *        The EObject represented by this ModelElement

 	 */

@@ -86,9 +84,9 @@ public class UMLModelElement extends EMFModelElement {
 	}

 

 	/**

-	 * 

+	 *

 	 * Constructor.

-	 * 

+	 *

 	 * @param source

 	 *        The EObject represented by this ModelElement

 	 * @param domain

@@ -103,10 +101,6 @@ public class UMLModelElement extends EMFModelElement {
 		FeaturePath featurePath = getFeaturePath(propertyPath);

 		EStructuralFeature feature = getFeature(propertyPath);

 

-		if(feature == UMLPackage.eINSTANCE.getMessage_Signature()) {

-			return new SignatureObservableValue(source, domain);

-		}

-

 		if(feature == UMLPackage.eINSTANCE.getExtension_IsRequired()) {

 			return new ExtensionRequiredObservableValue((Extension)source, domain);

 		}

@@ -159,9 +153,6 @@ public class UMLModelElement extends EMFModelElement {
 	@Override

 	public IStaticContentProvider getContentProvider(String propertyPath) {

 		EStructuralFeature feature = getFeature(propertyPath);

-		if(feature == UMLPackage.eINSTANCE.getMessage_Signature() || feature == UMLPackage.eINSTANCE.getSendOperationEvent_Operation() || feature == UMLPackage.eINSTANCE.getReceiveOperationEvent_Operation()) {

-			return new SignatureContentProvider(source);

-		}

 

 		if(feature == UMLPackage.eINSTANCE.getPort_Provided() || feature == UMLPackage.eINSTANCE.getPort_Required()) {

 			Package root = null;

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/providers/SignatureContentProvider.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/providers/SignatureContentProvider.java
deleted file mode 100644
index 67a6e63ffab..00000000000
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/providers/SignatureContentProvider.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.uml.properties.providers;

-

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.papyrus.infra.widgets.providers.AbstractStaticContentProvider;

-import org.eclipse.papyrus.uml.properties.util.UMLUtil;

-import org.eclipse.papyrus.uml.tools.utils.PackageUtil;

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

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

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

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

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

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

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

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

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

-

-/**

- * A ContentProvider for retrieving the valid values for a Message's signature

- * The Message's signature is a derived property, which is not natively

- * editable, and doesn't have a standard content provider.

- * 

- * @author Camille Letavernier

- */

-public class SignatureContentProvider extends AbstractStaticContentProvider {

-

-	private Message message;

-

-	private MessageEvent sourceEvent;

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param source

-	 *        The source EObject. May be a {@link Message}, a {@link ReceiveOperationEvent} or

-	 *        a {@link SendOperationEvent}

-	 */

-	public SignatureContentProvider(EObject source) {

-		if(source instanceof Message) {

-			this.message = (Message)source;

-		} else if(source instanceof ReceiveOperationEvent || source instanceof SendOperationEvent) {

-

-			sourceEvent = (MessageEvent)source;

-

-		} else {

-			throw new IllegalArgumentException("The source EObject is not a valid element"); //$NON-NLS-1$

-		}

-

-	}

-

-	public Object[] getElements() {

-		if(message != null) {

-			return getElementsFromMessage();

-		} else if(sourceEvent != null) {

-			return getElementsFromEvent();

-		}

-

-		return new Object[0]; //Should never happen, as either message or sourceEvent should be set

-	}

-

-	private Object[] getElementsFromMessage() {

-		org.eclipse.uml2.uml.Class clazz = UMLUtil.getContextClassForMessage(message);

-		return getElementsFromContext(clazz);

-	}

-

-	private Object[] getElementsFromEvent() {

-		org.eclipse.uml2.uml.Class clazz = UMLUtil.getContextClassForMessageEvent(sourceEvent);

-		if(clazz == null) {

-			return new Object[0];

-		}

-		return getElementsFromContext(clazz);

-	}

-

-	private Object[] getElementsFromContext(org.eclipse.uml2.uml.Class clazz) {

-		if(clazz == null) {

-			return new Object[0];

-		}

-		List<EObject> result = new LinkedList<EObject>();

-		result.addAll(clazz.getOwnedOperations());

-		if(message != null && (message.getMessageSort() == MessageSort.ASYNCH_CALL_LITERAL || message.getMessageSort() == MessageSort.ASYNCH_SIGNAL_LITERAL)) {

-			result.addAll(getAllSignals(clazz));

-		}

-		return result.toArray();

-	}

-

-	private List<Signal> getAllSignals(Element element) {

-		List<Signal> result = new LinkedList<Signal>();

-		Set<Package> browsedPackages = new HashSet<Package>();

-		org.eclipse.uml2.uml.Package rootPackage = PackageUtil.getRootPackage(element);

-		fillSignals(result, rootPackage, browsedPackages);

-		return result;

-	}

-

-	/**

-	 * Recursively fills the result collection with all signals found from the given rootPackage

-	 * 

-	 * @param result

-	 * @param rootPackage

-	 * @param browsedPackages

-	 */

-	private void fillSignals(Collection<Signal> result, Package rootPackage, Set<Package> browsedPackages) {

-		if(browsedPackages.contains(rootPackage)) {

-			return;

-		}

-

-		browsedPackages.add(rootPackage);

-

-		Iterator<EObject> iterator = EcoreUtil.getAllContents(rootPackage, true);

-		while(iterator.hasNext()) {

-			EObject eObject = iterator.next();

-			if(eObject instanceof Signal) {

-				result.add((Signal)eObject);

-			} else if(eObject instanceof PackageImport) {

-				PackageImport packageImport = (PackageImport)eObject;

-				Package importedPackage = packageImport.getImportedPackage();

-				fillSignals(result, importedPackage, browsedPackages);

-			}

-		}

-	}

-

-}

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/providers/UMLContentProvider.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/providers/UMLContentProvider.java
index fd7ee903526..92da6ba53fd 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/providers/UMLContentProvider.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/providers/UMLContentProvider.java
@@ -1,6 +1,6 @@
 /*****************************************************************************

  * Copyright (c) 2011 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

@@ -8,6 +8,7 @@
  *

  * Contributors:

  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr

  *****************************************************************************/

 package org.eclipse.papyrus.uml.properties.providers;

 

@@ -31,14 +32,14 @@ import org.eclipse.uml2.uml.Package;
 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

- * 

+ *

  * A content provider for UML

- * 

+ *

  */

 public class UMLContentProvider extends EncapsulatedContentProvider implements IStaticContentProvider {

 

 	/**

-	 * 

+	 *

 	 * Constructor.

 	 *

 	 * @param source

@@ -46,12 +47,11 @@ public class UMLContentProvider extends EncapsulatedContentProvider implements I
 	 */

 	public UMLContentProvider(final Element source, final EStructuralFeature feature) {

 		IStaticContentProvider localProvider;

-		if(feature == UMLPackage.eINSTANCE.getMessage_Signature() || feature == UMLPackage.eINSTANCE.getSendOperationEvent_Operation() || feature == UMLPackage.eINSTANCE.getReceiveOperationEvent_Operation()) {

-			localProvider = new SignatureContentProvider(source);

-		} else if(feature instanceof EReference) {

+

+		if(feature instanceof EReference) {

 			Package root = null;

-			if(((Element)source).getNearestPackage() != null) {

-				root = PackageUtil.getRootPackage((Element)source);

+			if(source.getNearestPackage() != null) {

+				root = PackageUtil.getRootPackage(source);

 			}

 

 			ServiceEditFilteredUMLContentProvider contentProvider;

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/SelectOrCreateDialog.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/SelectOrCreateDialog.java
deleted file mode 100644
index 3beafac0a7d..00000000000
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/SelectOrCreateDialog.java
+++ /dev/null
@@ -1,674 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA

- *

- * 

- * 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:

- *   Atos Origin - Initial API and implementation

- *   Camille Letavernir (camille.letavernier@cea.fr) - Adaptation of the Dialog to the property view Framework

- *

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

-package org.eclipse.papyrus.uml.properties.widgets;

-

-import java.util.Collection;

-import java.util.Collections;

-import java.util.Iterator;

-import java.util.LinkedHashMap;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.command.AddCommand;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.jface.dialogs.IDialogConstants;

-import org.eclipse.jface.viewers.ComboViewer;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ITreeContentProvider;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.infra.widgets.editors.ITreeSelectorDialog;

-import org.eclipse.papyrus.uml.properties.messages.Messages;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.ModifyEvent;

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.events.SelectionAdapter;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.events.SelectionListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Button;

-import org.eclipse.swt.widgets.Combo;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.swt.widgets.Text;

-import org.eclipse.ui.dialogs.ElementListSelectionDialog;

-import org.eclipse.ui.forms.FormDialog;

-import org.eclipse.ui.forms.IManagedForm;

-import org.eclipse.ui.forms.widgets.ExpandableComposite;

-import org.eclipse.ui.forms.widgets.FormToolkit;

-import org.eclipse.ui.forms.widgets.ScrolledForm;

-import org.eclipse.ui.forms.widgets.Section;

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

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

-

-/**

- * This class provides a generic dialog to select or create an element.

- */

-public class SelectOrCreateDialog extends FormDialog implements ITreeSelectorDialog {

-

-	private EObject selectedElement = null;

-

-	private EClass selectedType = null;

-

-	private String selectedName = null;

-

-	private EObject selectedParent = null;

-

-	private Collection<EObject> existingElements;

-

-	private LinkedHashMap<EClass, List<EObject>> mapTypesPossibleParents;

-

-	private Button nothingRadio;

-

-	private Button selectionRadio;

-

-	private Text selectionText;

-

-	private Button selectionButton;

-

-	private Button creationRadio;

-

-	private Text creationNameText;

-

-	private ComboViewer typeComboViewer = null;

-

-	private Combo creationTypeCombo = null;

-

-	private Button creationParentButton;

-

-	private Text creationParentText;

-

-	private String title;

-

-	private ILabelProvider typeLabelProvider;

-

-	private ILabelProvider elementLabelProvider;

-

-	private TransactionalEditingDomain transactionalEditingDomain;

-

-	private EStructuralFeature createInFeature;

-

-	/**

-	 * 

-	 * @param shell

-	 *        parent shell

-	 * @param title

-	 *        The title of the dialog

-	 * @param typeLabelProvider

-	 *        The label provider to generate type label

-	 * @param elementLabelProvider

-	 *        The label provider to generate elements label

-	 * @param transactionalEditingDomain

-	 *        The domain where to create the element if necessary.

-	 * @param existingElements

-	 *        The list of existing elements that can be selected.

-	 * @param mapTypesPossibleParents

-	 *        The map of possible types for the element

-	 *        and the possible parents where the element

-	 *        can be created.

-	 */

-	public SelectOrCreateDialog(Shell shell, String title, ILabelProvider typeLabelProvider, ILabelProvider elementLabelProvider, TransactionalEditingDomain transactionalEditingDomain, Collection<EObject> existingElements, LinkedHashMap<EClass, List<EObject>> mapTypesPossibleParents) {

-		super(shell);

-		this.typeLabelProvider = typeLabelProvider;

-		this.elementLabelProvider = elementLabelProvider;

-		this.existingElements = existingElements;

-		this.mapTypesPossibleParents = mapTypesPossibleParents;

-		this.title = title;

-		this.transactionalEditingDomain = transactionalEditingDomain;

-	}

-

-	/**

-	 * Adds buttons to this dialog's button bar.

-	 * 

-	 * @param parent

-	 *        the button bar composite

-	 */

-	@Override

-	protected void createButtonsForButtonBar(Composite parent) {

-		super.createButtonsForButtonBar(parent);

-		refreshOkButton();

-	}

-

-	/**

-	 * Create the form to :

-	 * 

-	 * - ask the user to select or create an element.

-	 * 

-	 * - decide whether the action is synchronous.

-	 * 

-	 * @see org.eclipse.ui.forms.FormDialog#createFormContent(org.eclipse.ui.forms.IManagedForm)

-	 */

-	@Override

-	protected void createFormContent(IManagedForm pForm) {

-		ScrolledForm scrolledForm = pForm.getForm();

-		scrolledForm.setText(title);

-

-		FormToolkit toolkit = pForm.getToolkit();

-		Composite parent = scrolledForm.getBody();

-		parent.setLayout(new GridLayout());

-

-		// Create the selection section

-		createSelectionSection(scrolledForm.getBody(), toolkit);

-		// Create the creation section

-		createCreationSection(scrolledForm.getBody(), toolkit);

-

-

-		// Create the nothing section

-		createNothingSection(scrolledForm.getBody(), toolkit);

-

-

-		refreshSectionsEnable(selectionRadio);

-		hookListeners();

-

-		// name is set after listeners, since we count on listener to update it properly

-		setName(null);

-

-		scrolledForm.reflow(true);

-	}

-

-	private void createNothingSection(Composite pParent, FormToolkit pToolkit) {

-		// create the section

-		Section lSection = pToolkit.createSection(pParent, ExpandableComposite.EXPANDED | ExpandableComposite.TITLE_BAR);

-		lSection.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));

-

-		ScrolledForm lInsideScrolledForm = pToolkit.createScrolledForm(lSection);

-		lInsideScrolledForm.setExpandHorizontal(true);

-		lInsideScrolledForm.setExpandVertical(true);

-		Composite lBody = lInsideScrolledForm.getBody();

-

-		lBody.setLayout(new GridLayout(1, false));

-

-		// content of the section

-		nothingRadio = pToolkit.createButton(lBody, Messages.SelectOrCreateDialog_NothingLabel, SWT.RADIO);

-		nothingRadio.setSelection(true);

-		nothingRadio.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));

-

-		lInsideScrolledForm.reflow(true);

-		lSection.setClient(lInsideScrolledForm);

-	}

-

-	/**

-	 * Create the section to ask the user to select or create an element.

-	 * 

-	 * @param pParent

-	 *        the section's parent widget

-	 * @param pToolkit

-	 *        the form toolkit

-	 */

-	private void createSelectionSection(Composite pParent, FormToolkit pToolkit) {

-		// create the section

-		Section lSection = pToolkit.createSection(pParent, ExpandableComposite.EXPANDED | ExpandableComposite.TITLE_BAR);

-		lSection.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));

-

-		ScrolledForm lInsideScrolledForm = pToolkit.createScrolledForm(lSection);

-		lInsideScrolledForm.setExpandHorizontal(true);

-		lInsideScrolledForm.setExpandVertical(true);

-		Composite lBody = lInsideScrolledForm.getBody();

-

-		lBody.setLayout(new GridLayout(3, false));

-

-		// content of the section

-		selectionRadio = pToolkit.createButton(lBody, Messages.SelectOrCreateDialog_SelectLabel, SWT.RADIO);

-		selectionRadio.setSelection(true);

-		selectionRadio.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 3, 1));

-

-		selectionText = pToolkit.createText(lBody, "", SWT.BORDER | SWT.READ_ONLY); //$NON-NLS-1$

-		selectionText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));

-		selectionButton = pToolkit.createButton(lBody, "...", SWT.FLAT); //$NON-NLS-1$

-

-		if(selectedElement != null) {

-			setElementSelection(selectedElement);

-		}

-

-		// find the first non null eobject and use its associated image

-		if(existingElements != null) {

-			Iterator<EObject> it = existingElements.iterator();

-			while(it.hasNext()) {

-				EObject next = it.next();

-				if(next != null) {

-					//selectionButton.setImage(UMLElementTypes.getImage(next.eClass())); //TODO : Image

-					break;

-				}

-			}

-		}

-

-		selectionButton.setLayoutData(new GridData(SWT.NONE));

-

-		lInsideScrolledForm.reflow(true);

-		lSection.setClient(lInsideScrolledForm);

-	}

-

-	/**

-	 * Create the section to ask the user to select or create an element.

-	 * 

-	 * @param pParent

-	 *        the section's parent widget

-	 * @param pToolkit

-	 *        the form toolkit

-	 */

-	private void createCreationSection(Composite pParent, FormToolkit pToolkit) {

-		// create the section

-		Section lSection = pToolkit.createSection(pParent, ExpandableComposite.EXPANDED | ExpandableComposite.TITLE_BAR);

-		lSection.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));

-

-		ScrolledForm lInsideScrolledForm = pToolkit.createScrolledForm(lSection);

-		lInsideScrolledForm.setExpandHorizontal(true);

-		lInsideScrolledForm.setExpandVertical(true);

-		Composite lBody = lInsideScrolledForm.getBody();

-

-		lBody.setLayout(new GridLayout(3, false));

-

-		// content of the section

-		creationRadio = pToolkit.createButton(lBody, Messages.SelectOrCreateDialog_CreateLabel, SWT.RADIO);

-		creationRadio.setSelection(false);

-		creationRadio.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 3, 1));

-

-		EClass defaultType = null;

-		Set<EClass> possibleTypes = mapTypesPossibleParents.keySet();

-

-		// only create the type selection buttons if more than one type

-		// is possible

-		if(possibleTypes.size() == 1) {

-			defaultType = (EClass)possibleTypes.toArray()[0];

-		} else {

-			pToolkit.createLabel(lBody, Messages.SelectOrCreateDialog_TypeLabel, SWT.NONE);

-			creationTypeCombo = new Combo(lBody, SWT.DROP_DOWN | SWT.READ_ONLY);

-			typeComboViewer = new ComboViewer(creationTypeCombo);

-			pToolkit.adapt(creationTypeCombo);

-			creationTypeCombo.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));

-			typeComboViewer.setLabelProvider(typeLabelProvider);

-			typeComboViewer.add(possibleTypes.toArray());

-			if(possibleTypes.size() > 1) {

-				// initialize selection

-				defaultType = (EClass)possibleTypes.toArray()[0];

-				typeComboViewer.setSelection(new StructuredSelection(defaultType));

-			}

-		}

-

-		pToolkit.createLabel(lBody, Messages.SelectOrCreateDialog_NameLabel, SWT.NONE);

-		creationNameText = pToolkit.createText(lBody, "", SWT.BORDER); //$NON-NLS-1$

-		creationNameText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));

-

-		pToolkit.createLabel(lBody, Messages.SelectOrCreateDialog_OwnerLabel + ":", SWT.NONE); //$NON-NLS-1$

-		creationParentText = pToolkit.createText(lBody, elementLabelProvider.getText(selectedParent), SWT.BORDER | SWT.READ_ONLY);

-		creationParentText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));

-		creationParentButton = pToolkit.createButton(lBody, "...", SWT.FLAT); //$NON-NLS-1$

-		creationParentButton.setLayoutData(new GridData(SWT.NONE));

-

-		setType(defaultType);

-

-		lInsideScrolledForm.reflow(true);

-		lSection.setClient(lInsideScrolledForm);

-	}

-

-	/**

-	 * Add listeners to widgets

-	 */

-	private void hookListeners() {

-		// listener to choose active section

-		SelectionListener radioListener = new SelectionAdapter() {

-

-			/**

-			 * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)

-			 */

-			@Override

-			public void widgetSelected(SelectionEvent e) {

-				refreshSectionsEnable(e.getSource());

-				refreshOkButton();

-			}

-		};

-		selectionRadio.addSelectionListener(radioListener);

-		creationRadio.addSelectionListener(radioListener);

-		nothingRadio.addSelectionListener(radioListener);

-

-		// listener to select existing element

-		SelectionListener selectBtnListener = new SelectionAdapter() {

-

-			/**

-			 * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)

-			 */

-			@Override

-			public void widgetSelected(SelectionEvent e) {

-				handleSelectElement();

-			}

-		};

-		selectionButton.addSelectionListener(selectBtnListener);

-

-		if(creationTypeCombo != null && typeComboViewer != null) {

-			// listener to select invocation type

-			ModifyListener lTypeListener = new ModifyListener() {

-

-				/**

-				 * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent)

-				 */

-				public void modifyText(ModifyEvent e) {

-					ISelection sel = typeComboViewer.getSelection();

-					if(sel instanceof StructuredSelection) {

-						Object type = ((StructuredSelection)sel).getFirstElement();

-						if(type instanceof EClass) {

-							setType((EClass)type);

-						} else {

-							setType(null);

-						}

-						// reset name

-						setName(null);

-					}

-				}

-			};

-			creationTypeCombo.addModifyListener(lTypeListener);

-		}

-

-		// listener to invocation element name

-		ModifyListener lNameListener = new ModifyListener() {

-

-			/**

-			 * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent)

-			 */

-			public void modifyText(ModifyEvent e) {

-				selectedName = creationNameText.getText();

-				refreshOkButton();

-			}

-		};

-		creationNameText.addModifyListener(lNameListener);

-

-		// listener to select new element parent

-		SelectionListener selectParentBtnListener = new SelectionAdapter() {

-

-			/**

-			 * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)

-			 */

-			@Override

-			public void widgetSelected(SelectionEvent e) {

-				handleSelectParent();

-			}

-		};

-		creationParentButton.addSelectionListener(selectParentBtnListener);

-	}

-

-	/**

-	 * Refresh the OK button activation

-	 */

-	private void refreshOkButton() {

-		Button okButton = getButton(IDialogConstants.OK_ID);

-		if(okButton != null && !okButton.isDisposed()) {

-			if(selectionRadio.getSelection()) {

-				okButton.setEnabled(selectedElement != null);

-			} else if(nothingRadio.getSelection()) {

-				okButton.setEnabled(true);

-			} else {

-				okButton.setEnabled(selectedType != null && selectedParent != null && selectedName != null && !"".equals(selectedName)); //$NON-NLS-1$

-			}

-		}

-	}

-

-	/**

-	 * Add the created element to its selected parent

-	 * 

-	 * @param selectedParent

-	 *        The parent in which the element should be added

-	 * @param createdElement

-	 *        The created element to add to its parent

-	 */

-	protected void addElementInParent(EObject selectedParent, EObject createdElement) {

-		// Let the command find the relation on its own.

-		Command addCmd = AddCommand.create(transactionalEditingDomain, selectedParent, null /* createInFeature */, Collections.singleton(createdElement));

-		if(addCmd.canExecute()) {

-			//addCmd.execute(); //TODO : Needs to be executed in a WriteTransaction

-			transactionalEditingDomain.getCommandStack().execute(addCmd); //Two commands are being executed...

-		}

-	}

-

-	/**

-	 * Set correctly the element, by creating it if needed.

-	 * Then, notifies that the ok button of this dialog has been pressed.

-	 * 

-	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()

-	 * 

-	 */

-	@Override

-	protected void okPressed() {

-		// create element if needed

-		if(creationRadio.getSelection()) {

-			selectedElement = UMLFactory.eINSTANCE.create(selectedType);

-			if(selectedElement instanceof NamedElement) {

-				((NamedElement)selectedElement).setName(selectedName);

-			}

-			addElementInParent(selectedParent, selectedElement);

-		} else if(nothingRadio.getSelection()) {

-			selectedElement = null;

-		}

-		super.okPressed();

-	}

-

-	/**

-	 * Open the dialog to choose the existing element to select

-	 * 

-	 */

-	private void handleSelectElement() {

-		ElementListSelectionDialog dialog = new ElementListSelectionDialog(getShell(), elementLabelProvider);

-		dialog.setMessage(Messages.SelectOrCreateDialog_SelectLabel);

-		dialog.setMultipleSelection(false);

-		dialog.setElements(existingElements.toArray(new EObject[existingElements.size()]));

-		if(dialog.open() == Window.OK) {

-			setElementSelection((EObject)dialog.getFirstResult());

-		}

-	}

-

-	/**

-	 * Open the dialog to choose the parent of element to create

-	 * 

-	 */

-	private void handleSelectParent() {

-		ElementListSelectionDialog dialog = new ElementListSelectionDialog(getShell(), elementLabelProvider);

-		dialog.setMessage(Messages.SelectOrCreateDialog_OwnerLabel);

-		dialog.setMultipleSelection(false);

-		List<EObject> possibleParents = mapTypesPossibleParents.get(selectedType);

-		if(possibleParents != null) {

-			dialog.setElements(possibleParents.toArray());

-		}

-		if(dialog.open() == Window.OK) {

-			setParent((EObject)dialog.getFirstResult());

-		}

-	}

-

-	/**

-	 * Define the object in which element will be created (if creation mode is chosen)

-	 * 

-	 * @param parent

-	 *        the selected parent

-	 */

-	private void setParent(EObject parent) {

-		selectedParent = parent;

-		if(selectedParent instanceof NamedElement) {

-			creationParentText.setText(elementLabelProvider.getText(selectedParent));

-			//creationParentButton.setImage(UMLElementTypes.getImage(parent.eClass())); //TODO : Image

-		} else {

-			creationParentText.setText(""); //$NON-NLS-1$

-		}

-		refreshOkButton();

-	}

-

-	/**

-	 * Define the name of the object that will be created by the action

-	 * 

-	 * @param name

-	 *        the name of the element

-	 */

-	private void setName(String name) {

-		selectedName = name;

-		if(name != null) {

-			creationNameText.setText(name);

-		} else {

-			creationNameText.setText(""); //$NON-NLS-1$

-		}

-		refreshOkButton();

-	}

-

-	/**

-	 * Define the type of the object that will be created by the action

-	 * 

-	 * @param type

-	 *        the type of the element

-	 */

-	private void setType(EClass type) {

-		selectedType = type;

-		List<EObject> possibleParents = mapTypesPossibleParents.get(type);

-		if(possibleParents != null && possibleParents.size() > 0) {

-			setParent(possibleParents.get(0));

-		} else {

-			setParent(null);

-		}

-		refreshOkButton();

-	}

-

-	/**

-	 * Define the object that will be returned by the action (if selection mode is chosen)

-	 * 

-	 * @param element

-	 *        the selected element

-	 */

-	private void setElementSelection(EObject element) {

-		selectedElement = element;

-		if(selectedElement instanceof NamedElement) {

-			selectionText.setText(elementLabelProvider.getText(selectedElement));

-		} else {

-			selectionText.setText(""); //$NON-NLS-1$

-		}

-		refreshOkButton();

-	}

-

-	/**

-	 * Refresh the enabled and disabled elements in various sections

-	 * 

-	 */

-	private void refreshSectionsEnable(Object radioObject) {

-		boolean nothingSelected = false;

-		boolean selectionSelected = false;

-		boolean creationSelected = false;

-		if(selectionRadio.equals(radioObject)) {

-			selectionSelected = true;

-		} else if(creationRadio.equals(radioObject)) {

-			creationSelected = true;

-		} else {

-			nothingSelected = true;

-		}

-

-		// Selection widgets

-		selectionRadio.setSelection(selectionSelected);

-		selectionText.setEnabled(selectionSelected);

-		selectionButton.setEnabled(selectionSelected);

-

-		// Creation widgets

-		creationRadio.setSelection(creationSelected);

-		if(creationTypeCombo != null) {

-			creationTypeCombo.setEnabled(creationSelected);

-		}

-		creationNameText.setEnabled(creationSelected);

-		creationParentText.setEnabled(creationSelected);

-		creationParentButton.setEnabled(creationSelected);

-

-		// Nothing widgets

-		nothingRadio.setSelection(nothingSelected);

-	}

-

-	/**

-	 * Get the object that have been selected or created.

-	 * 

-	 * @return the object to use.

-	 */

-	public EObject getSelected() {

-		return selectedElement;

-	}

-

-	public void setLabelProvider(ILabelProvider provider) {

-		typeLabelProvider = provider;

-		elementLabelProvider = provider;

-	}

-

-	public void setContentProvider(ITreeContentProvider provider) {

-		this.existingElements = new LinkedList<EObject>();

-		for(Object object : provider.getElements(null)) {

-			if(object instanceof EObject) {

-				this.existingElements.add((EObject)object);

-			}

-		}

-	}

-

-	public void setDescription(String description) {

-		//Skip

-	}

-

-	public void setInput(Object input) {

-		//Useful ?

-	}

-

-	public void setInitialElementSelections(List selectedElements) {

-		if(selectedElements.isEmpty()) {

-			return;

-		}

-		Object firstItem = selectedElements.get(0);

-		if(firstItem instanceof EObject) {

-			selectedElement = (EObject)firstItem;

-		}

-	}

-

-	public EObject[] getResult() {

-		return new EObject[]{ getSelected() };

-	}

-

-	public void setTitle(String label) {

-		if(getShell() != null) { //TODO : The shell seems to be null here

-			getShell().setText(label);

-		}

-	}

-

-	/**

-	 * Indicates how and where the element should be created

-	 * 

-	 * @param type

-	 *        The type of element to instantiate

-	 * @param parentObject

-	 *        The object in which the element should be created

-	 * @param feature

-	 *        The feature in which the element will be set

-	 */

-	public void setCreateAs(EClass type, EObject parentObject, EStructuralFeature feature) {

-		if(parentObject != null) {

-			this.mapTypesPossibleParents.put(type, Collections.singletonList(parentObject));

-		}

-		this.createInFeature = feature;

-	}

-

-	/**

-	 * Sets the Editing Domain on which the commands will be executed

-	 * 

-	 * @param domain

-	 *        the Editing Domain on which the commands will be executed

-	 */

-	public void setEditingDomain(EditingDomain domain) {

-		if(domain instanceof TransactionalEditingDomain) {

-			this.transactionalEditingDomain = (TransactionalEditingDomain)domain;

-		}

-	}

-

-}

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/SelectOrCreateDialogEditor.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/SelectOrCreateDialogEditor.java
deleted file mode 100644
index 3bdb3f8ea28..00000000000
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/SelectOrCreateDialogEditor.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.uml.properties.widgets;

-

-import java.util.Collections;

-import java.util.LinkedHashMap;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.papyrus.infra.widgets.editors.ITreeSelectorDialog;

-import org.eclipse.papyrus.infra.widgets.editors.ReferenceDialog;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Shell;

-

-

-public class SelectOrCreateDialogEditor extends ReferenceDialog {

-

-	protected SelectOrCreateDialog selectOrCreateDialog;

-

-	public SelectOrCreateDialogEditor(Composite parent, int style) {

-		super(parent, style);

-	}

-

-	@Override

-	protected ITreeSelectorDialog createDialog(Shell shell) {

-		return selectOrCreateDialog = new SelectOrCreateDialog(shell, "title", null, null, null, Collections.EMPTY_LIST, new LinkedHashMap());

-	}

-

-	//	public void setCreateAs(EClass createAs) {

-	//		//Unsupported yet

-	//	}

-

-	public void setCreateAs(EClass createAs, EObject inParentObject, EStructuralFeature feature) {

-		selectOrCreateDialog.setCreateAs(createAs, inParentObject, feature);

-	}

-

-	public void setEditingDomain(EditingDomain domain) {

-		selectOrCreateDialog.setEditingDomain(domain);

-	}

-

-}

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/SelectOrCreateDialogPropertyEditor.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/SelectOrCreateDialogPropertyEditor.java
deleted file mode 100644
index 224bb59ac46..00000000000
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/SelectOrCreateDialogPropertyEditor.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.uml.properties.widgets;

-

-import java.util.HashSet;

-import java.util.Set;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.uml.properties.modelelement.UMLModelElement;

-import org.eclipse.papyrus.uml.properties.util.UMLUtil;

-import org.eclipse.papyrus.views.properties.modelelement.ModelElement;

-import org.eclipse.papyrus.views.properties.widgets.AbstractPropertyEditor;

-import org.eclipse.swt.widgets.Composite;

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

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

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

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

-

-//TODO : this widget needs to be made generic

-public class SelectOrCreateDialogPropertyEditor extends AbstractPropertyEditor {

-

-

-	private static Set<EClass> validEClasses = new HashSet<EClass>();

-

-	private static Set<EStructuralFeature> validFeatures = new HashSet<EStructuralFeature>();

-

-	static {

-		validEClasses.add(UMLPackage.eINSTANCE.getMessageEvent());

-		validEClasses.add(UMLPackage.eINSTANCE.getMessage());

-

-		validFeatures.add(UMLPackage.eINSTANCE.getSendOperationEvent_Operation());

-		validFeatures.add(UMLPackage.eINSTANCE.getReceiveOperationEvent_Operation());

-

-		validFeatures.add(UMLPackage.eINSTANCE.getSendSignalEvent_Signal());

-		validFeatures.add(UMLPackage.eINSTANCE.getReceiveSignalEvent_Signal());

-

-		validFeatures.add(UMLPackage.eINSTANCE.getMessage_Signature());

-	}

-

-	protected SelectOrCreateDialogEditor editor;

-

-	public SelectOrCreateDialogPropertyEditor(Composite parent, int style) {

-		editor = new SelectOrCreateDialogEditor(parent, style);

-		setEditor(editor);

-	}

-

-	@Override

-	protected void doBinding() {

-		super.doBinding();

-

-		editor.setContentProvider(input.getContentProvider(propertyPath));

-		editor.setLabelProvider(input.getLabelProvider(propertyPath));

-

-		ModelElement element = input.getModelElement(propertyPath);

-		if(element instanceof UMLModelElement) {

-			UMLModelElement umlModelElement = (UMLModelElement)element;

-			EStructuralFeature feature = umlModelElement.getFeature(getLocalPropertyPath());

-

-			EObject sourceElement = umlModelElement.getSource();

-

-			if(!isValidFeature(feature)) {

-				throw new IllegalArgumentException("The widget SelectOrCreateDialogPropertyEditor cannot be used with this property : " + propertyPath);

-			}

-

-			if(!isValidEObject(sourceElement)) {

-				throw new IllegalArgumentException("The widget SelectOrCreateDialogPropertyEditor cannot be used with this kind of object : " + sourceElement.eClass());

-			}

-

-			Class parentClass = findParentClass(sourceElement);

-

-			if(parentClass != null) {

-				editor.setCreateAs(UMLPackage.eINSTANCE.getOperation(), parentClass, UMLPackage.eINSTANCE.getClass_OwnedOperation());

-				editor.setCreateAs(UMLPackage.eINSTANCE.getSignal(), parentClass.getNearestPackage(), UMLPackage.eINSTANCE.getPackage_PackagedElement());

-			}

-

-			editor.setEditingDomain(umlModelElement.getDomain());

-		}

-	}

-

-	private Class findParentClass(EObject sourceElement) {

-		if(sourceElement instanceof Message) {

-			return UMLUtil.getContextClassForMessage((Message)sourceElement);

-		}

-

-		if(sourceElement instanceof MessageEvent) {

-			return UMLUtil.getContextClassForMessageEvent((MessageEvent)sourceElement);

-		}

-

-		return null;

-	}

-

-	private boolean isValidEObject(EObject sourceElement) {

-		for(EClass eClass : validEClasses) {

-			if(eClass.isInstance(sourceElement)) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-	private boolean isValidFeature(EStructuralFeature feature) {

-		return validFeatures.contains(feature);

-	}

-}

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/MessageUtil.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/MessageUtil.java
deleted file mode 100644
index a961472b82b..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/MessageUtil.java
+++ /dev/null
@@ -1,334 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2008 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:
- *  Remi SCHNEKENBURGER (CEA LIST) Remi.schnekenburger@cea.fr - Initial API and implementation
- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Rewrite of setMessageSignature
- * 
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.utils;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.common.command.UnexecutableCommand;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.infra.core.utils.PapyrusEcoreUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.Event;
-import org.eclipse.uml2.uml.Message;
-import org.eclipse.uml2.uml.MessageEnd;
-import org.eclipse.uml2.uml.MessageOccurrenceSpecification;
-import org.eclipse.uml2.uml.MessageSort;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Operation;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.Signal;
-import org.eclipse.uml2.uml.UMLPackage;
-
-public class MessageUtil {
-
-	/**
-	 * Sets the signature for a Message. As the signature is a derived property, calling this
-	 * method may lead to a refactoring of the model. When changing from an operation to another
-	 * operation, this method changes the operation associated to the send and receive events
-	 * associated to the message.
-	 * 
-	 * However, when changing from a Signal to an Operation (This should be possible only in the case
-	 * of an AsynchSignal message), an important refactoring is needed.
-	 * The following changes occur :
-	 * 
-	 * - The SendSignalEvent is transformed to a SendOperationEvent
-	 * - The ReceiveSignalEvent is transformed to a ReceiveSignalEvent
-	 * - The SendSignalEvent and ReceiveSignalEvent are destroyed, if and only if they are not referenced by any other element
-	 * - The operation is assigned to both the SendOperationEvent and ReceiveOperationEvent
-	 * - The Message#messageSort is changed from AsynchSignal to AsynchCall
-	 * 
-	 * If one of the SignalEvents is missing, the corresponding OperationEvent is *not* created.
-	 * If none of the events exist, then only the messageSort is changed.
-	 * 
-	 * All these changes are executed in a single Command, executed on the given editing domain.
-	 * The Command is obtained through the Papyrus Service Edit
-	 * 
-	 * @param message
-	 *        The message to edit
-	 * @param newOperation
-	 *        The operation to assign to the message's signature
-	 * @param domain
-	 *        The message's TransactionalEditingDomain
-	 */
-	public static void setMessageSignature(Message message, Operation newOperation, TransactionalEditingDomain domain) {
-		setMessageSignature(message, newOperation, domain, UMLPackage.eINSTANCE.getSendSignalEvent(), UMLPackage.eINSTANCE.getSendOperationEvent(), UMLPackage.eINSTANCE.getSendOperationEvent_Operation(), UMLPackage.eINSTANCE.getReceiveSignalEvent(), UMLPackage.eINSTANCE.getReceiveOperationEvent(), UMLPackage.eINSTANCE.getReceiveOperationEvent_Operation(), MessageSort.ASYNCH_SIGNAL_LITERAL, MessageSort.ASYNCH_CALL_LITERAL);
-	}
-
-	/**
-	 * Sets the signature for a Message. As the signature is a derived property, calling this
-	 * method may lead to a refactoring of the model. When changing from a signal to another
-	 * signal, this method changes the signal associated to the send and receive events
-	 * associated to the message.
-	 * 
-	 * However, when changing from an Operation to a Signal (This should be possible only in the case
-	 * of an AsynchCall message), an important refactoring is needed.
-	 * The following changes occur :
-	 * 
-	 * - The SendOperationEvent is transformed to a SendSignalEvent
-	 * - The ReceiveOperationEvent is transformed to a ReceiveSignalEvent
-	 * - The SendOperationEvent and ReceiveOperationEvent are destroyed, if and only if they are not referenced by any other element
-	 * - The signal is assigned to both the SendSignalEvent and ReceiveSignalEvent
-	 * - The Message#messageSort is changed from AsynchCall to AsynchSignal
-	 * 
-	 * If one of the OperationEvents is missing, the corresponding SignalEvent is *not* created.
-	 * If none of the events exist, then only the messageSort is changed.
-	 * 
-	 * All these changes are executed in a single Command, executed on the given editing domain.
-	 * The Command is obtained through the Papyrus Service Edit
-	 * 
-	 * @param message
-	 *        The message to edit
-	 * @param newOperation
-	 *        The operation to assign to the message's signature
-	 * @param domain
-	 *        The message's TransactionalEditingDomain
-	 */
-	public static void setMessageSignature(Message message, Signal newSignal, TransactionalEditingDomain domain) {
-		setMessageSignature(message, newSignal, domain, UMLPackage.eINSTANCE.getSendOperationEvent(), UMLPackage.eINSTANCE.getSendSignalEvent(), UMLPackage.eINSTANCE.getSendSignalEvent_Signal(), UMLPackage.eINSTANCE.getReceiveOperationEvent(), UMLPackage.eINSTANCE.getReceiveSignalEvent(), UMLPackage.eINSTANCE.getReceiveSignalEvent_Signal(), MessageSort.ASYNCH_CALL_LITERAL, MessageSort.ASYNCH_SIGNAL_LITERAL);
-	}
-
-	/**
-	 * A generic method to edit the message's signature
-	 * 
-	 * @param message
-	 *        The message being edited
-	 * @param signature
-	 *        The new signature
-	 * @param domain
-	 *        The EditingDomain on which the command is executed
-	 * @param fromSendClass
-	 *        If the current event is an instance of this class, a refactoring is needed
-	 * @param toSendClass
-	 *        The EClass corresponding to the expected SendEvent. This class will be instantiated when a refactoring is needed
-	 *        The new instance will be created in the same package as the previous event.
-	 * @param toSendFeature
-	 *        The EStructuralFeature on which the new value will be set
-	 * @param fromReceiveClass
-	 *        If the current event is an instance of this class, a refactoring is needed
-	 * @param toReceiveClass
-	 *        The EClass corresponding to the expected ReceiveEvent. This class will be instantiated when a refactoring is needed.
-	 *        The new instance will be created in the same package as the previous event.
-	 * @param toReceiveFeature
-	 *        The EStructuralFeature on which the new value will be set
-	 * @param fromSort
-	 *        If the current MessageSort is equal to this value, the MessageSort will be changed
-	 * @param toSort
-	 *        The new MessageSort to set if the current MessageSort is equal to fromSort
-	 */
-	private static void setMessageSignature(Message message, Element signature, TransactionalEditingDomain domain, EClass fromSendClass, EClass toSendClass, EStructuralFeature toSendFeature, EClass fromReceiveClass, EClass toReceiveClass, EStructuralFeature toReceiveFeature, MessageSort fromSort, MessageSort toSort) {
-
-		if(message == null) {
-			return;
-		}
-
-		MessageEnd receiveEnd = message.getReceiveEvent();
-		MessageEnd sendEnd = message.getSendEvent();
-
-		CompoundCommand command = new CompoundCommand(""); //$NON-NLS-1$
-
-		List<Element> receiveElementsToAdd = new LinkedList<Element>(); //out argument
-		List<Element> receiveElementsToRemove = new LinkedList<Element>(); //out argument
-		Package receiveEventParent = refactor(receiveEnd, fromReceiveClass, toReceiveClass, toReceiveFeature, signature, command, domain, receiveElementsToAdd, receiveElementsToRemove);
-
-		List<Element> sendElementsToAdd = new LinkedList<Element>(); //out argument
-		List<Element> sendElementsToRemove = new LinkedList<Element>(); //out argument
-		Package sendEventParent = refactor(sendEnd, fromSendClass, toSendClass, toSendFeature, signature, command, domain, sendElementsToAdd, sendElementsToRemove);
-
-		//All elements are added/removed at the same time to avoid a SetCommand to override another one
-		if(sendEventParent != null && receiveEventParent == sendEventParent) {
-			List<Element> ownedElements = new BasicEList<Element>(sendEventParent.getPackagedElements());
-			ownedElements.addAll(sendElementsToAdd);
-			ownedElements.addAll(receiveElementsToAdd);
-			ownedElements.removeAll(sendElementsToRemove);
-			ownedElements.removeAll(receiveElementsToRemove);
-			command.append(setValueToElement(sendEventParent, UMLPackage.eINSTANCE.getPackage_PackagedElement(), ownedElements, domain));
-		} else {
-			if(sendEventParent != null) {
-				List<Element> ownedElements = new BasicEList<Element>(sendEventParent.getPackagedElements());
-				ownedElements.addAll(sendElementsToAdd);
-				ownedElements.remove(sendElementsToRemove);
-				command.append(setValueToElement(sendEventParent, UMLPackage.eINSTANCE.getPackage_PackagedElement(), ownedElements, domain));
-			}
-			if(receiveEventParent != null) {
-				List<Element> ownedElements = new BasicEList<Element>(receiveEventParent.getPackagedElements());
-				ownedElements.addAll(receiveElementsToAdd);
-				ownedElements.remove(receiveElementsToRemove);
-				command.append(setValueToElement(receiveEventParent, UMLPackage.eINSTANCE.getPackage_PackagedElement(), ownedElements, domain));
-			}
-		}
-
-		if(fromSort != null && message.getMessageSort() == fromSort) {
-			MessageSort messageSort = toSort;
-			command.append(setValueToElement(message, UMLPackage.eINSTANCE.getMessage_MessageSort(), messageSort, domain));
-		}
-
-		domain.getCommandStack().execute(command);
-	}
-
-
-	/**
-	 * A generic method to refactor the SendEvent and ReceiveEvent when needed.
-	 * This method does *not* execute the commands. Instead, the generated commands
-	 * are appended to the given CompoundCommand.
-	 * 
-	 * This method outputs 3 elements :
-	 * 
-	 * - elementsToAdd (out) : The elements to add to the returned package
-	 * - elementsToRemove (out) : The elements to remove from the returned package
-	 * - package (return) : The package in which the elements are added or from which they are removed
-	 * 
-	 * @param messageEnd
-	 *        The messageEnd that may need a refactoring
-	 * @param fromClass
-	 *        If the current event is an instance of this class, a refactoring is needed
-	 * @param toClass
-	 *        The EClass corresponding to the expected event. This class will be instantiated when a refactoring is needed
-	 * @param toFeature
-	 *        The EStructuralFeature on which the new value will be set
-	 * @param elementToSet
-	 *        The value to assign to the new event
-	 * @param command
-	 *        The edition commands will be appended to this CompoundCommand
-	 * @param domain
-	 *        The TransactionalEditingDomain on which the commands will be executed
-	 * @param elementsToAdd
-	 *        The elements to add to the returned package
-	 * @param elementsToRemove
-	 *        The elements to remove from the returned package
-	 * @return
-	 *         The package in which the elements are added or from which they are removed.
-	 *         This method doesn't execute any change directly, nor returns
-	 *         any command affecting the package's content. The reason is that when chaining commands
-	 *         (With "SetRequest" or "SetCommand") on multiple-reference features, the full list of element is needed.
-	 *         Thus, when we have two consecutive SetRequests applied on the same element, the second one overrides the first one.
-	 *         The best solution would be to have an "AddRequest" and a "RemoveRequest", but none of these requests exist. The "RemoveRequest"
-	 *         can be replaced by a "DestroyElementRequest", but this is still not compatible with the SetRequest used to add new elements
-	 *         to the package, which will override it (And restore the deleted element).
-	 */
-	private static Package refactor(MessageEnd messageEnd, EClass fromClass, EClass toClass, EStructuralFeature toFeature, Element elementToSet, CompoundCommand command, TransactionalEditingDomain domain, List<Element> elementsToAdd, List<Element> elementsToRemove) {
-
-		Package messageEventParent = null;
-
-		if((messageEnd != null) && (messageEnd instanceof MessageOccurrenceSpecification)) {
-			MessageOccurrenceSpecification messageOccSpec = (MessageOccurrenceSpecification)messageEnd;
-			Event event = messageOccSpec.getEvent();
-
-			if(event != null) {
-				if(fromClass.isInstance(event)) {
-					//Delete the previous event if it isn't used anymore
-					if(PapyrusEcoreUtils.isOnlyUsage(event, messageOccSpec)) {
-						elementsToRemove.add(event);
-					}
-
-					//Create the new event
-					messageEventParent = event.getNearestPackage();
-					event = (Event)UMLPackage.eINSTANCE.getEFactoryInstance().create(toClass);
-					elementsToAdd.add(event);
-					command.append(setValueToElement(messageOccSpec, UMLPackage.eINSTANCE.getOccurrenceSpecification_Event(), event, domain));
-				}
-
-				if(toClass.isInstance(event)) {
-					command.append(setValueToElement(event, toFeature, elementToSet, domain));
-				}
-			}
-		}
-
-		return messageEventParent;
-	}
-
-	/**
-	 * Return an EMF Command from the given GMF Request.
-	 * The EMF Command is obtained via the Papyrus Service Edit.
-	 * 
-	 * @param source
-	 *        The source EObject on which the command applies
-	 * @param request
-	 *        The Request used to generate the command
-	 * @return
-	 *         The EMF Command corresponding to the given request.
-	 *         May be an UnexecutableCommand if an error occurs.
-	 */
-	private static Command getCommandFromRequest(Element source, IEditCommandRequest request) {
-		try {
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(source);
-
-			if(provider != null) {
-				ICommand createGMFCommand = provider.getEditCommand(request);
-
-				Command emfCommand = new GMFtoEMFCommandWrapper(createGMFCommand);
-
-				return emfCommand;
-			}
-		} catch (Exception ex) {
-			Activator.logException(ex);
-		}
-
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * Creates and returns an EMF Command to handle a model change.
-	 * The command uses the Papyrus Service Edit.
-	 * 
-	 * @param source
-	 *        The EObject being edited
-	 * @param feature
-	 *        The source's structural feature being edited
-	 * @param value
-	 *        The new value to set
-	 * @param domain
-	 *        The editing domain on which the command should be executed
-	 * @return
-	 *         The EMF Command
-	 */
-	private static Command setValueToElement(Element source, EStructuralFeature feature, Object value, TransactionalEditingDomain domain) {
-		SetRequest request = new SetRequest(domain, source, feature, value);
-		return getCommandFromRequest(source, request);
-	}
-
-	// @unused
-	public static Operation getMessageOperation(Message message) {
-
-		NamedElement signature = message.getSignature();
-		if(signature instanceof Operation) {
-			return (Operation)signature;
-		} else {
-			return null;
-		}
-	}
-
-	// @unused
-	public static Signal getMessageSignal(Message message) {
-
-		NamedElement signature = message.getSignature();
-		if(signature instanceof Signal) {
-			return (Signal)signature;
-		} else {
-			return null;
-		}
-	}
-}