[483574] Change viewpoint and diagram Meta-model

Bug: 483574
Change-Id: I39b519b7a4c2ffbc1b0a51b4f34c3de17b49661b
Signed-off-by: Laurent Fasani <laurent.fasani@obeo.fr>

7 files changed, 99 insertions, 56 deletions

diff --git a/plugins/org.eclipse.sirius.diagram.sequence/model/sequence.ecore b/plugins/org.eclipse.sirius.diagram.sequence/model/sequence.ecore
index 875f54cedc..c96be9d877 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/model/sequence.ecore
+++ b/plugins/org.eclipse.sirius.diagram.sequence/model/sequence.ecore
@@ -80,8 +80,8 @@
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="CreationMessageMapping" eSuperTypes="#//description/MessageMapping"/>
     <eClassifiers xsi:type="ecore:EClass" name="DestructionMessageMapping" eSuperTypes="#//description/MessageMapping"/>
-    <eClassifiers xsi:type="ecore:EClass" name="MessageEndVariable" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/AbstractVariable"/>
-    <eClassifiers xsi:type="ecore:EClass" name="CoveredLifelinesVariable" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/AbstractVariable"/>
+    <eClassifiers xsi:type="ecore:EClass" name="MessageEndVariable" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//description/AbstractVariable"/>
+    <eClassifiers xsi:type="ecore:EClass" name="CoveredLifelinesVariable" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//description/AbstractVariable"/>
     <eClassifiers xsi:type="ecore:EClass" name="FrameMapping" abstract="true" eSuperTypes="../../org.eclipse.sirius.diagram/model/diagram.ecore#//description/ContainerMapping #//description/DelimitedEventMapping">
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="coveredLifelinesExpression"
           lowerBound="1" eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/InterpretedExpression">
diff --git a/plugins/org.eclipse.sirius.diagram/model/diagram.ecore b/plugins/org.eclipse.sirius.diagram/model/diagram.ecore
index d04038600b..c7e69bc284 100644
--- a/plugins/org.eclipse.sirius.diagram/model/diagram.ecore
+++ b/plugins/org.eclipse.sirius.diagram/model/diagram.ecore
@@ -899,13 +899,7 @@
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="FilterVariableHistory">
     <eStructuralFeatures xsi:type="ecore:EReference" name="ownedValues" upperBound="-1"
-        eType="#//FilterVariableValue" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FilterVariableValue">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="variableDefinition" lowerBound="1"
-        eType="#//description/filter/FilterVariable"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="modelElement" lowerBound="1"
-        eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
+        eType="#//VariableValue" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EEnum" name="ResizeKind">
     <eLiterals name="NONE"/>
@@ -978,6 +972,18 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="VariableValue" abstract="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="TypedVariableValue" eSuperTypes="#//VariableValue">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="variableDefinition" lowerBound="1"
+        eType="ecore:EClass ../../org.eclipse.sirius/model/viewpoint.ecore#//description/TypedVariable"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="EObjectVariableValue" eSuperTypes="#//VariableValue">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="variableDefinition" lowerBound="1"
+        eType="ecore:EClass ../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/SelectModelElementVariable"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="modelElement" lowerBound="1"
+        eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
+  </eClassifiers>
   <eSubpackages name="description" nsURI="http://www.eclipse.org/sirius/diagram/description/1.1.0"
       nsPrefix="description">
     <eClassifiers xsi:type="ecore:EClass" name="DiagramDescription" eSuperTypes="#//description/DragAndDropTargetDescription ../../org.eclipse.sirius/model/viewpoint.ecore#//description/RepresentationDescription ../../org.eclipse.sirius/model/viewpoint.ecore#//description/PasteTargetDescription">
@@ -2668,14 +2674,14 @@
           </eAnnotations>
         </eStructuralFeatures>
       </eClassifiers>
-      <eClassifiers xsi:type="ecore:EClass" name="SourceEdgeCreationVariable" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/AbstractVariable ../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/VariableContainer"/>
+      <eClassifiers xsi:type="ecore:EClass" name="SourceEdgeCreationVariable" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//description/AbstractVariable ../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/VariableContainer"/>
       <eClassifiers xsi:type="ecore:EClass" name="SourceEdgeViewCreationVariable"
-          eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/AbstractVariable ../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/VariableContainer"/>
-      <eClassifiers xsi:type="ecore:EClass" name="TargetEdgeCreationVariable" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/AbstractVariable ../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/VariableContainer"/>
+          eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//description/AbstractVariable ../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/VariableContainer"/>
+      <eClassifiers xsi:type="ecore:EClass" name="TargetEdgeCreationVariable" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//description/AbstractVariable ../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/VariableContainer"/>
       <eClassifiers xsi:type="ecore:EClass" name="TargetEdgeViewCreationVariable"
-          eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/AbstractVariable ../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/VariableContainer"/>
-      <eClassifiers xsi:type="ecore:EClass" name="ElementDoubleClickVariable" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/AbstractVariable ../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/VariableContainer"/>
-      <eClassifiers xsi:type="ecore:EClass" name="NodeCreationVariable" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/AbstractVariable ../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/VariableContainer"/>
+          eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//description/AbstractVariable ../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/VariableContainer"/>
+      <eClassifiers xsi:type="ecore:EClass" name="ElementDoubleClickVariable" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//description/AbstractVariable ../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/VariableContainer"/>
+      <eClassifiers xsi:type="ecore:EClass" name="NodeCreationVariable" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//description/AbstractVariable ../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/VariableContainer"/>
       <eClassifiers xsi:type="ecore:EClass" name="CreateView" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/ContainerModelOperation">
         <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
           <details key="documentation" value="This operation allows to create a view."/>
@@ -2910,7 +2916,8 @@
           </eParameters>
         </eOperations>
         <eStructuralFeatures xsi:type="ecore:EReference" name="ownedVariables" upperBound="-1"
-            eType="#//description/filter/FilterVariable" containment="true"/>
+            eType="ecore:EClass ../../org.eclipse.sirius/model/viewpoint.ecore#//description/InteractiveVariableDescription"
+            containment="true"/>
         <eStructuralFeatures xsi:type="ecore:EAttribute" name="semanticConditionExpression"
             eType="ecore:EDataType ../../org.eclipse.sirius/model/viewpoint.ecore#//description/InterpretedExpression"
             defaultValueLiteral="">
@@ -2923,14 +2930,6 @@
           <eAnnotations source="http://www.eclipse.org/sirius/interpreted/expression/variables"/>
         </eStructuralFeatures>
       </eClassifiers>
-      <eClassifiers xsi:type="ecore:EClass" name="FilterVariable" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//description/SelectionDescription">
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1"
-            eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString">
-          <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-            <details key="documentation" value="Name of the variable."/>
-          </eAnnotations>
-        </eStructuralFeatures>
-      </eClassifiers>
       <eClassifiers xsi:type="ecore:EEnum" name="FilterKind">
         <eLiterals name="HIDE"/>
         <eLiterals name="COLLAPSE" value="1"/>
diff --git a/plugins/org.eclipse.sirius.diagram/model/diagram.genmodel b/plugins/org.eclipse.sirius.diagram/model/diagram.genmodel
index 081f6c4608..bfe2d71a30 100644
--- a/plugins/org.eclipse.sirius.diagram/model/diagram.genmodel
+++ b/plugins/org.eclipse.sirius.diagram/model/diagram.genmodel
@@ -279,10 +279,6 @@
     <genClasses ecoreClass="diagram.ecore#//FilterVariableHistory">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference diagram.ecore#//FilterVariableHistory/ownedValues"/>
     </genClasses>
-    <genClasses ecoreClass="diagram.ecore#//FilterVariableValue">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diagram.ecore#//FilterVariableValue/variableDefinition"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diagram.ecore#//FilterVariableValue/modelElement"/>
-    </genClasses>
     <genClasses ecoreClass="diagram.ecore#//CollapseFilter">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//CollapseFilter/width"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//CollapseFilter/height"/>
@@ -316,6 +312,15 @@
     <genClasses image="false" ecoreClass="diagram.ecore#//HideLabelCapabilityStyle">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//HideLabelCapabilityStyle/hideLabelByDefault"/>
     </genClasses>
+    <genClasses ecoreClass="diagram.ecore#//VariableValue"/>
+    <genClasses ecoreClass="diagram.ecore#//TypedVariableValue">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diagram.ecore#//TypedVariableValue/variableDefinition"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diagram.ecore#//TypedVariableValue/value"/>
+    </genClasses>
+    <genClasses ecoreClass="diagram.ecore#//EObjectVariableValue">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diagram.ecore#//EObjectVariableValue/variableDefinition"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diagram.ecore#//EObjectVariableValue/modelElement"/>
+    </genClasses>
     <nestedGenPackages prefix="Description" basePackage="org.eclipse.sirius.diagram"
         disposableProviderFactory="true" childCreationExtenders="true" ecorePackage="diagram.ecore#//description">
       <genEnums ecoreEnum="diagram.ecore#//description/FoldingStyle">
@@ -949,9 +954,6 @@
             <genParameters ecoreParameter="diagram.ecore#//description/filter/VariableFilter/setFilterContext/variables"/>
           </genOperations>
         </genClasses>
-        <genClasses ecoreClass="diagram.ecore#//description/filter/FilterVariable">
-          <genFeatures createChild="false" propertyCategory="General" ecoreFeature="ecore:EAttribute diagram.ecore#//description/filter/FilterVariable/name"/>
-        </genClasses>
       </nestedGenPackages>
       <nestedGenPackages prefix="Concern" basePackage="org.eclipse.sirius.diagram.description"
           disposableProviderFactory="true" childCreationExtenders="true" ecorePackage="diagram.ecore#//description/concern">
diff --git a/plugins/org.eclipse.sirius.table/model/table.ecore b/plugins/org.eclipse.sirius.table/model/table.ecore
index c9523db549..70072a60ca 100644
--- a/plugins/org.eclipse.sirius.table/model/table.ecore
+++ b/plugins/org.eclipse.sirius.table/model/table.ecore
@@ -237,7 +237,8 @@
         </eAnnotations>
       </eStructuralFeatures>
       <eStructuralFeatures xsi:type="ecore:EReference" name="importedElements" upperBound="-1"
-          eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject" containment="true"/>
+          eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"
+          containment="true"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="EditionTableDescription" eSuperTypes="#//description/TableDescription">
       <eStructuralFeatures xsi:type="ecore:EReference" name="ownedColumnMappings"
@@ -554,7 +555,7 @@
       <eStructuralFeatures xsi:type="ecore:EReference" name="style" eType="#//description/BackgroundStyleDescription"
           containment="true"/>
     </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="TableVariable" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/AbstractVariable ../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/VariableContainer">
+    <eClassifiers xsi:type="ecore:EClass" name="TableVariable" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//description/AbstractVariable ../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/VariableContainer">
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="documentation" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="TableCreationDescription" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/RepresentationCreationDescription">
diff --git a/plugins/org.eclipse.sirius.tree/model/tree.ecore b/plugins/org.eclipse.sirius.tree/model/tree.ecore
index 27c7dcac62..7fe714678e 100644
--- a/plugins/org.eclipse.sirius.tree/model/tree.ecore
+++ b/plugins/org.eclipse.sirius.tree/model/tree.ecore
@@ -243,7 +243,7 @@
       <eStructuralFeatures xsi:type="ecore:EReference" name="conditionalStyles" upperBound="-1"
           eType="#//description/ConditionalTreeItemStyleDescription" containment="true"/>
     </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="TreeVariable" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/AbstractVariable ../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/VariableContainer">
+    <eClassifiers xsi:type="ecore:EClass" name="TreeVariable" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//description/AbstractVariable ../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/VariableContainer">
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="documentation" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="TreeItemUpdater">
diff --git a/plugins/org.eclipse.sirius/model/viewpoint.ecore b/plugins/org.eclipse.sirius/model/viewpoint.ecore
index e270a926c7..29bba1407b 100644
--- a/plugins/org.eclipse.sirius/model/viewpoint.ecore
+++ b/plugins/org.eclipse.sirius/model/viewpoint.ecore
@@ -855,6 +855,41 @@
           eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EDataType" name="URI" instanceClassName="org.eclipse.emf.common.util.URI"/>
+    <eClassifiers xsi:type="ecore:EClass" name="AbstractVariable" abstract="true">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="SubVariable" abstract="true" eSuperTypes="#//description/AbstractVariable"/>
+    <eClassifiers xsi:type="ecore:EClass" name="InteractiveVariableDescription" abstract="true"
+        interface="true">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="This interface represents a variable which value is given by the user."/>
+      </eAnnotations>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="userDocumentation" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString">
+        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+          <details key="documentation" value="A documentation that is displayed to the user."/>
+        </eAnnotations>
+      </eStructuralFeatures>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="TypedVariable" eSuperTypes="#//description/InteractiveVariableDescription #//description/SubVariable">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultValueExpression"
+          eType="#//description/InterpretedExpression">
+        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+          <details key="documentation" value="An expression used to define the default variable value."/>
+        </eAnnotations>
+        <eAnnotations source="http://www.eclipse.org/sirius/interpreted/expression/returnType">
+          <details key="returnType" value="Must return an instance of type valueType."/>
+        </eAnnotations>
+        <eAnnotations source="http://www.eclipse.org/sirius/interpreted/expression/variables">
+          <details key="diagram" value="diagram.DDiagram | the current DDiagram."/>
+        </eAnnotations>
+      </eStructuralFeatures>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="valueType" lowerBound="1"
+          eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EDataType">
+        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+          <details key="documentation" value="The type of the variable value."/>
+        </eAnnotations>
+      </eStructuralFeatures>
+    </eClassifiers>
     <eSubpackages name="style" nsURI="http://www.eclipse.org/sirius/description/style/1.1.0"
         nsPrefix="style">
       <eClassifiers xsi:type="ecore:EClass" name="StyleDescription" abstract="true"
@@ -1301,14 +1336,11 @@
             lowerBound="1" upperBound="-1" eType="#//description/tool/MenuItemDescription"
             containment="true"/>
       </eClassifiers>
-      <eClassifiers xsi:type="ecore:EClass" name="AbstractVariable" abstract="true">
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-      </eClassifiers>
       <eClassifiers xsi:type="ecore:EClass" name="VariableContainer" abstract="true">
         <eStructuralFeatures xsi:type="ecore:EReference" name="subVariables" upperBound="-1"
-            eType="#//description/tool/SubVariable" containment="true"/>
+            eType="#//description/SubVariable" containment="true"/>
       </eClassifiers>
-      <eClassifiers xsi:type="ecore:EClass" name="AcceleoVariable" eSuperTypes="#//description/tool/VariableContainer #//description/tool/SubVariable">
+      <eClassifiers xsi:type="ecore:EClass" name="AcceleoVariable" eSuperTypes="#//description/tool/VariableContainer #//description/SubVariable">
         <eStructuralFeatures xsi:type="ecore:EAttribute" name="computationExpression"
             eType="#//description/InterpretedExpression">
           <eAnnotations source="http://www.eclipse.org/sirius/interpreted/expression/returnType">
@@ -1317,20 +1349,19 @@
           <eAnnotations source="http://www.eclipse.org/sirius/interpreted/expression/variables"/>
         </eStructuralFeatures>
       </eClassifiers>
-      <eClassifiers xsi:type="ecore:EClass" name="SubVariable" abstract="true" eSuperTypes="#//description/tool/AbstractVariable"/>
       <eClassifiers xsi:type="ecore:EClass" name="DialogVariable" abstract="true"
-          eSuperTypes="#//description/tool/AbstractVariable">
+          eSuperTypes="#//description/AbstractVariable">
         <eStructuralFeatures xsi:type="ecore:EAttribute" name="dialogPrompt" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
       </eClassifiers>
-      <eClassifiers xsi:type="ecore:EClass" name="ElementDropVariable" eSuperTypes="#//description/tool/AbstractVariable #//description/tool/VariableContainer"/>
-      <eClassifiers xsi:type="ecore:EClass" name="ElementSelectVariable" eSuperTypes="#//description/tool/AbstractVariable"/>
-      <eClassifiers xsi:type="ecore:EClass" name="ElementVariable" eSuperTypes="#//description/tool/AbstractVariable #//description/tool/VariableContainer"/>
-      <eClassifiers xsi:type="ecore:EClass" name="ElementViewVariable" eSuperTypes="#//description/tool/AbstractVariable #//description/tool/VariableContainer"/>
-      <eClassifiers xsi:type="ecore:EClass" name="ElementDeleteVariable" eSuperTypes="#//description/tool/AbstractVariable #//description/tool/VariableContainer"/>
-      <eClassifiers xsi:type="ecore:EClass" name="DropContainerVariable" eSuperTypes="#//description/tool/AbstractVariable #//description/tool/VariableContainer"/>
-      <eClassifiers xsi:type="ecore:EClass" name="SelectContainerVariable" eSuperTypes="#//description/tool/AbstractVariable #//description/tool/VariableContainer"/>
-      <eClassifiers xsi:type="ecore:EClass" name="ContainerViewVariable" eSuperTypes="#//description/tool/AbstractVariable #//description/tool/VariableContainer"/>
-      <eClassifiers xsi:type="ecore:EClass" name="SelectModelElementVariable" eSuperTypes="#//description/tool/SubVariable #//description/SelectionDescription"/>
+      <eClassifiers xsi:type="ecore:EClass" name="ElementDropVariable" eSuperTypes="#//description/AbstractVariable #//description/tool/VariableContainer"/>
+      <eClassifiers xsi:type="ecore:EClass" name="ElementSelectVariable" eSuperTypes="#//description/AbstractVariable"/>
+      <eClassifiers xsi:type="ecore:EClass" name="ElementVariable" eSuperTypes="#//description/AbstractVariable #//description/tool/VariableContainer"/>
+      <eClassifiers xsi:type="ecore:EClass" name="ElementViewVariable" eSuperTypes="#//description/AbstractVariable #//description/tool/VariableContainer"/>
+      <eClassifiers xsi:type="ecore:EClass" name="ElementDeleteVariable" eSuperTypes="#//description/AbstractVariable #//description/tool/VariableContainer"/>
+      <eClassifiers xsi:type="ecore:EClass" name="DropContainerVariable" eSuperTypes="#//description/AbstractVariable #//description/tool/VariableContainer"/>
+      <eClassifiers xsi:type="ecore:EClass" name="SelectContainerVariable" eSuperTypes="#//description/AbstractVariable #//description/tool/VariableContainer"/>
+      <eClassifiers xsi:type="ecore:EClass" name="ContainerViewVariable" eSuperTypes="#//description/AbstractVariable #//description/tool/VariableContainer"/>
+      <eClassifiers xsi:type="ecore:EClass" name="SelectModelElementVariable" eSuperTypes="#//description/SubVariable #//description/SelectionDescription #//description/InteractiveVariableDescription"/>
       <eClassifiers xsi:type="ecore:EClass" name="EditMaskVariables">
         <eStructuralFeatures xsi:type="ecore:EAttribute" name="mask" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString">
           <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -1533,7 +1564,7 @@
           <details key="documentation" value="Deletes the current context if it is a view"/>
         </eAnnotations>
       </eClassifiers>
-      <eClassifiers xsi:type="ecore:EClass" name="NameVariable" eSuperTypes="#//description/tool/AbstractVariable"/>
+      <eClassifiers xsi:type="ecore:EClass" name="NameVariable" eSuperTypes="#//description/AbstractVariable"/>
       <eClassifiers xsi:type="ecore:EClass" name="ExternalJavaActionParameter">
         <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1"
             eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString">
diff --git a/plugins/org.eclipse.sirius/model/viewpoint.genmodel b/plugins/org.eclipse.sirius/model/viewpoint.genmodel
index 96bae535e6..0eb3086a64 100644
--- a/plugins/org.eclipse.sirius/model/viewpoint.genmodel
+++ b/plugins/org.eclipse.sirius/model/viewpoint.genmodel
@@ -392,6 +392,21 @@
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute viewpoint.ecore#//description/DAnnotationEntry/source"/>
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute viewpoint.ecore#//description/DAnnotationEntry/details"/>
       </genClasses>
+      <genClasses image="false" ecoreClass="viewpoint.ecore#//description/AbstractVariable">
+        <genFeatures createChild="false" propertyDescription="Name of the variable, you may access it in expressions using theNameOfTheVariable."
+            ecoreFeature="ecore:EAttribute viewpoint.ecore#//description/AbstractVariable/name"/>
+      </genClasses>
+      <genClasses image="false" ecoreClass="viewpoint.ecore#//description/SubVariable"/>
+      <genClasses image="false" ecoreClass="viewpoint.ecore#//description/InteractiveVariableDescription">
+        <genFeatures createChild="false" propertyDescription="A documentation that is displayed to the user"
+            ecoreFeature="ecore:EAttribute viewpoint.ecore#//description/InteractiveVariableDescription/userDocumentation"/>
+      </genClasses>
+      <genClasses ecoreClass="viewpoint.ecore#//description/TypedVariable">
+        <genFeatures createChild="false" propertyDescription="An expression used to define the default variable value"
+            ecoreFeature="ecore:EAttribute viewpoint.ecore#//description/TypedVariable/defaultValueExpression"/>
+        <genFeatures notify="false" createChild="false" propertyDescription="The type of the variable value"
+            propertySortChoices="true" ecoreFeature="ecore:EReference viewpoint.ecore#//description/TypedVariable/valueType"/>
+      </genClasses>
       <nestedGenPackages prefix="Style" basePackage="org.eclipse.sirius.viewpoint.description"
           disposableProviderFactory="true" extensibleProviderFactory="true" ecorePackage="viewpoint.ecore#//description/style">
         <genClasses image="false" ecoreClass="viewpoint.ecore#//description/style/StyleDescription"/>
@@ -531,10 +546,6 @@
         <genClasses ecoreClass="viewpoint.ecore#//description/tool/PopupMenu">
           <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference viewpoint.ecore#//description/tool/PopupMenu/menuItemDescription"/>
         </genClasses>
-        <genClasses image="false" ecoreClass="viewpoint.ecore#//description/tool/AbstractVariable">
-          <genFeatures createChild="false" propertyCategory="General" propertyDescription="Name of the variable, you may access it in expressions using theNameOfTheVariable."
-              ecoreFeature="ecore:EAttribute viewpoint.ecore#//description/tool/AbstractVariable/name"/>
-        </genClasses>
         <genClasses image="false" ecoreClass="viewpoint.ecore#//description/tool/VariableContainer">
           <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference viewpoint.ecore#//description/tool/VariableContainer/subVariables"/>
         </genClasses>
@@ -542,7 +553,6 @@
           <genFeatures createChild="false" propertyCategory="General" propertyDescription="Expression retrieving the variable value starting from the current element."
               ecoreFeature="ecore:EAttribute viewpoint.ecore#//description/tool/AcceleoVariable/computationExpression"/>
         </genClasses>
-        <genClasses image="false" ecoreClass="viewpoint.ecore#//description/tool/SubVariable"/>
         <genClasses image="false" ecoreClass="viewpoint.ecore#//description/tool/DialogVariable">
           <genFeatures createChild="false" propertyCategory="General" propertyDescription="Dialog message showed to the user."
               ecoreFeature="ecore:EAttribute viewpoint.ecore#//description/tool/DialogVariable/dialogPrompt"/>