[481733] Add missing eKeys to references towards ValidationRule

This will ensure URIs which reference validation rules use the rule's
identifier instead of its position (which is brittle).

Bug: 481733
Change-Id: I4497f9b4624ee4e6b68e565de622d5cb68cdd704
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>

26 files changed, 71 insertions, 61 deletions

diff --git a/plugins/org.eclipse.sirius.diagram/model/diagram.ecore b/plugins/org.eclipse.sirius.diagram/model/diagram.ecore
index d1fc11d6fd..19ea734c8b 100644
--- a/plugins/org.eclipse.sirius.diagram/model/diagram.ecore
+++ b/plugins/org.eclipse.sirius.diagram/model/diagram.ecore
@@ -99,7 +99,8 @@
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="activatedRules" upperBound="-1"
-        eType="ecore:EClass ../../org.eclipse.sirius/model/viewpoint.ecore#//description/validation/ValidationRule">
+        eType="ecore:EClass ../../org.eclipse.sirius/model/viewpoint.ecore#//description/validation/ValidationRule"
+        eKeys="../../org.eclipse.sirius/model/viewpoint.ecore#//description/IdentifiedElement/name">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Validation rules that are currently activated for this viewpoint."/>
       </eAnnotations>
@@ -2968,7 +2969,8 @@
           </eAnnotations>
         </eStructuralFeatures>
         <eStructuralFeatures xsi:type="ecore:EReference" name="rules" upperBound="-1"
-            eType="ecore:EClass ../../org.eclipse.sirius/model/viewpoint.ecore#//description/validation/ValidationRule">
+            eType="ecore:EClass ../../org.eclipse.sirius/model/viewpoint.ecore#//description/validation/ValidationRule"
+            eKeys="../../org.eclipse.sirius/model/viewpoint.ecore#//description/IdentifiedElement/name">
           <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
             <details key="documentation" value="All rules of this concern."/>
           </eAnnotations>
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/BundledImage.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/BundledImage.java
index c2b561ada0..1ff9bb55ad 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/BundledImage.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/BundledImage.java
@@ -67,7 +67,7 @@ public interface BundledImage extends NodeStyle {
      * description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Color</em>' attribute.
      * @see #setColor(RGBValues)
      * @see org.eclipse.sirius.diagram.DiagramPackage#getBundledImage_Color()
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/DiagramPackage.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/DiagramPackage.java
index dc75b26557..aa2499602d 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/DiagramPackage.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/DiagramPackage.java
@@ -2161,7 +2161,7 @@ public interface DiagramPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -2297,7 +2297,7 @@ public interface DiagramPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -2528,7 +2528,7 @@ public interface DiagramPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -2656,7 +2656,7 @@ public interface DiagramPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -2811,7 +2811,7 @@ public interface DiagramPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -2956,7 +2956,7 @@ public interface DiagramPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -3115,7 +3115,7 @@ public interface DiagramPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -3276,7 +3276,7 @@ public interface DiagramPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -3435,7 +3435,7 @@ public interface DiagramPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -3596,7 +3596,7 @@ public interface DiagramPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -3740,7 +3740,7 @@ public interface DiagramPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -4048,7 +4048,7 @@ public interface DiagramPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -4271,7 +4271,7 @@ public interface DiagramPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -4512,7 +4512,7 @@ public interface DiagramPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -4581,7 +4581,7 @@ public interface DiagramPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -4650,7 +4650,7 @@ public interface DiagramPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -6732,7 +6732,7 @@ public interface DiagramPackage extends EPackage {
     /**
      * Returns the meta object for the attribute '{@link org.eclipse.sirius.diagram.Note#getColor <em>Color</em>}'. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @return the meta object for the attribute '<em>Color</em>'.
      * @see org.eclipse.sirius.diagram.Note#getColor()
      * @see #getNote()
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/Ellipse.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/Ellipse.java
index 8653b7eab4..b0aaac2230 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/Ellipse.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/Ellipse.java
@@ -88,7 +88,7 @@ public interface Ellipse extends NodeStyle {
      * description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Color</em>' attribute.
      * @see #setColor(RGBValues)
      * @see org.eclipse.sirius.diagram.DiagramPackage#getEllipse_Color()
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/Lozenge.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/Lozenge.java
index 17a380f4a7..43d527fd79 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/Lozenge.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/Lozenge.java
@@ -88,7 +88,7 @@ public interface Lozenge extends NodeStyle {
      * description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Color</em>' attribute.
      * @see #setColor(RGBValues)
      * @see org.eclipse.sirius.diagram.DiagramPackage#getLozenge_Color()
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/Note.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/Note.java
index 24da3bf7b6..61ad3f3d18 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/Note.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/Note.java
@@ -36,7 +36,7 @@ public interface Note extends NodeStyle {
      * description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Color</em>' attribute.
      * @see #setColor(RGBValues)
      * @see org.eclipse.sirius.diagram.DiagramPackage#getNote_Color()
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/Square.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/Square.java
index ffbf639a64..d16f6c489d 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/Square.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/Square.java
@@ -88,7 +88,7 @@ public interface Square extends NodeStyle {
      * description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Color</em>' attribute.
      * @see #setColor(RGBValues)
      * @see org.eclipse.sirius.diagram.DiagramPackage#getSquare_Color()
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/concern/impl/ConcernPackageImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/concern/impl/ConcernPackageImpl.java
index 3ab55a0899..5a66385d12 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/concern/impl/ConcernPackageImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/concern/impl/ConcernPackageImpl.java
@@ -292,6 +292,7 @@ public class ConcernPackageImpl extends EPackageImpl implements ConcernPackage {
         initEReference(getConcernDescription_Rules(), theValidationPackage.getValidationRule(), null, "rules", null, 0, -1, ConcernDescription.class, !EPackageImpl.IS_TRANSIENT, //$NON-NLS-1$
                 !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
                 !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        getConcernDescription_Rules().getEKeys().add(theDescriptionPackage_1.getIdentifiedElement_Name());
         initEReference(getConcernDescription_Behaviors(), theToolPackage.getBehaviorTool(), null, "behaviors", null, 0, -1, ConcernDescription.class, !EPackageImpl.IS_TRANSIENT, //$NON-NLS-1$
                 !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
                 !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/NodeStyleDescription.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/NodeStyleDescription.java
index 72c4d2563e..08ca2d1647 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/NodeStyleDescription.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/NodeStyleDescription.java
@@ -132,7 +132,7 @@ public interface NodeStyleDescription extends StyleDescription, BorderedStyleDes
      * </p>
      * <!-- end-user-doc --> <!-- begin-model-doc --> Select which side of the container is authorized or not. <!--
      * end-model-doc -->
-     * 
+     *
      * @return the value of the '<em>Forbidden Sides</em>' attribute list.
      * @see org.eclipse.sirius.diagram.description.style.Side
      * @see org.eclipse.sirius.diagram.description.style.StylePackage#getNodeStyleDescription_ForbiddenSides()
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/StylePackage.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/StylePackage.java
index cd6af66c2f..014a9aed22 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/StylePackage.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/style/StylePackage.java
@@ -152,7 +152,7 @@ public interface StylePackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -308,7 +308,7 @@ public interface StylePackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -472,7 +472,7 @@ public interface StylePackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -652,7 +652,7 @@ public interface StylePackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -834,7 +834,7 @@ public interface StylePackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -1015,7 +1015,7 @@ public interface StylePackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -1195,7 +1195,7 @@ public interface StylePackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -1358,7 +1358,7 @@ public interface StylePackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -1533,7 +1533,7 @@ public interface StylePackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -1869,7 +1869,7 @@ public interface StylePackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -2016,7 +2016,7 @@ public interface StylePackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -2217,7 +2217,7 @@ public interface StylePackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -2383,7 +2383,7 @@ public interface StylePackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -2675,7 +2675,7 @@ public interface StylePackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -2745,7 +2745,7 @@ public interface StylePackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -2814,7 +2814,7 @@ public interface StylePackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DiagramPackageImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DiagramPackageImpl.java
index 8cde4cdfc5..d14280bc17 100644
--- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DiagramPackageImpl.java
+++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/impl/DiagramPackageImpl.java
@@ -2822,6 +2822,7 @@ public class DiagramPackageImpl extends EPackageImpl implements DiagramPackage {
         initEReference(getDDiagram_ActivatedRules(), theValidationPackage.getValidationRule(), null, "activatedRules", null, 0, -1, DDiagram.class, !EPackageImpl.IS_TRANSIENT, //$NON-NLS-1$
                 !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
                 !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        getDDiagram_ActivatedRules().getEKeys().add(theDescriptionPackage_1.getIdentifiedElement_Name());
         initEReference(getDDiagram_ActivateBehaviors(), theToolPackage.getBehaviorTool(), null, "activateBehaviors", null, 0, -1, DDiagram.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, //$NON-NLS-1$
                 EPackageImpl.IS_CHANGEABLE,
                 !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
diff --git a/plugins/org.eclipse.sirius.properties/model/properties.ecore b/plugins/org.eclipse.sirius.properties/model/properties.ecore
index f2f7f69b3a..1a4fabba64 100644
--- a/plugins/org.eclipse.sirius.properties/model/properties.ecore
+++ b/plugins/org.eclipse.sirius.properties/model/properties.ecore
@@ -27,7 +27,7 @@
   <eClassifiers xsi:type="ecore:EClass" name="PageValidationSetDescription">
     <eStructuralFeatures xsi:type="ecore:EReference" name="semanticValidationRules"
         upperBound="-1" eType="ecore:EClass ../../org.eclipse.sirius/model/viewpoint.ecore#//description/validation/SemanticValidationRule"
-        containment="true"/>
+        containment="true" eKeys="../../org.eclipse.sirius/model/viewpoint.ecore#//description/IdentifiedElement/name"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="PropertyValidationRule" eSuperTypes="../../org.eclipse.sirius/model/viewpoint.ecore#//description/validation/ValidationRule">
     <eStructuralFeatures xsi:type="ecore:EReference" name="targets" upperBound="-1"
@@ -53,9 +53,9 @@
   <eClassifiers xsi:type="ecore:EClass" name="GroupValidationSetDescription">
     <eStructuralFeatures xsi:type="ecore:EReference" name="semanticValidationRules"
         upperBound="-1" eType="ecore:EClass ../../org.eclipse.sirius/model/viewpoint.ecore#//description/validation/SemanticValidationRule"
-        containment="true"/>
+        containment="true" eKeys="../../org.eclipse.sirius/model/viewpoint.ecore#//description/IdentifiedElement/name"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="propertyValidationRules"
-        upperBound="-1" eType="#//PropertyValidationRule" containment="true"/>
+        upperBound="-1" eType="#//PropertyValidationRule" containment="true" eKeys="../../org.eclipse.sirius/model/viewpoint.ecore#//description/IdentifiedElement/name"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ControlDescription" abstract="true">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
diff --git a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/GroupValidationSetDescription.java b/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/GroupValidationSetDescription.java
index ce5834ebcd..ab06925e1f 100644
--- a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/GroupValidationSetDescription.java
+++ b/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/GroupValidationSetDescription.java
@@ -62,7 +62,7 @@ public interface GroupValidationSetDescription extends EObject {
      * 
      * @return the value of the '<em>Property Validation Rules</em>' containment reference list.
      * @see org.eclipse.sirius.properties.PropertiesPackage#getGroupValidationSetDescription_PropertyValidationRules()
-     * @model containment="true"
+     * @model containment="true" keys="name"
      * @generated
      */
     EList<PropertyValidationRule> getPropertyValidationRules();
diff --git a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesPackageImpl.java b/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesPackageImpl.java
index 3700e467d1..2bffb63c63 100644
--- a/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesPackageImpl.java
+++ b/plugins/org.eclipse.sirius.properties/src-gen/org/eclipse/sirius/properties/impl/PropertiesPackageImpl.java
@@ -2743,6 +2743,7 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         initEReference(getPageValidationSetDescription_SemanticValidationRules(), theValidationPackage.getSemanticValidationRule(), null, "semanticValidationRules", null, 0, -1, //$NON-NLS-1$
                 PageValidationSetDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES,
                 !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        getPageValidationSetDescription_SemanticValidationRules().getEKeys().add(theDescriptionPackage.getIdentifiedElement_Name());
 
         initEClass(propertyValidationRuleEClass, PropertyValidationRule.class, "PropertyValidationRule", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, //$NON-NLS-1$
                 EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
@@ -2786,9 +2787,11 @@ public class PropertiesPackageImpl extends EPackageImpl implements PropertiesPac
         initEReference(getGroupValidationSetDescription_SemanticValidationRules(), theValidationPackage.getSemanticValidationRule(), null, "semanticValidationRules", null, 0, -1, //$NON-NLS-1$
                 GroupValidationSetDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES,
                 !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        getGroupValidationSetDescription_SemanticValidationRules().getEKeys().add(theDescriptionPackage.getIdentifiedElement_Name());
         initEReference(getGroupValidationSetDescription_PropertyValidationRules(), this.getPropertyValidationRule(), null, "propertyValidationRules", null, 0, -1, GroupValidationSetDescription.class, //$NON-NLS-1$
                 !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE,
                 EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        getGroupValidationSetDescription_PropertyValidationRules().getEKeys().add(theDescriptionPackage.getIdentifiedElement_Name());
 
         initEClass(controlDescriptionEClass, ControlDescription.class, "ControlDescription", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
         initEAttribute(getControlDescription_Identifier(), ecorePackage.getEString(), "identifier", null, 0, 1, ControlDescription.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, //$NON-NLS-1$
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/DColumn.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/DColumn.java
index 842c33d65a..b416fd83a9 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/DColumn.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/DColumn.java
@@ -146,7 +146,7 @@ public interface DColumn extends DTableElement {
      * </p>
      * <!-- end-user-doc --> <!-- begin-model-doc --> Same list as a"cells" but sorted according to the order of lines.
      * <!-- end-model-doc -->
-     * 
+     *
      * @return the value of the '<em>Ordered Cells</em>' reference list.
      * @see org.eclipse.sirius.table.metamodel.table.TablePackage#getDColumn_OrderedCells()
      * @model transient="true" changeable="false" volatile="true" derived="true"
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/DLine.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/DLine.java
index 94d759eaa1..6a3e161122 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/DLine.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/DLine.java
@@ -202,7 +202,7 @@ public interface DLine extends LineContainer, DTableElement {
      * </p>
      * <!-- end-user-doc --> <!-- begin-model-doc --> Same list as "cells" but sorted according to the order of columns.
      * <!-- end-model-doc -->
-     * 
+     *
      * @return the value of the '<em>Ordered Cells</em>' reference list.
      * @see org.eclipse.sirius.table.metamodel.table.TablePackage#getDLine_OrderedCells()
      * @model transient="true" changeable="false" volatile="true" derived="true"
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/TablePackage.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/TablePackage.java
index 2e18af64e2..59b4096e6a 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/TablePackage.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/TablePackage.java
@@ -522,7 +522,7 @@ public interface TablePackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -594,7 +594,7 @@ public interface TablePackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
diff --git a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/DescriptionPackage.java b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/DescriptionPackage.java
index 2748954124..66f052ae0f 100644
--- a/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/DescriptionPackage.java
+++ b/plugins/org.eclipse.sirius.table/src-gen/org/eclipse/sirius/table/metamodel/table/description/DescriptionPackage.java
@@ -2722,7 +2722,7 @@ public interface DescriptionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
diff --git a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/TreePackage.java b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/TreePackage.java
index bd358ca8e1..1f1e5bc688 100644
--- a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/TreePackage.java
+++ b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/TreePackage.java
@@ -411,7 +411,7 @@ public interface TreePackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
diff --git a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/DescriptionPackage.java b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/DescriptionPackage.java
index 01bf2bc481..be5f826065 100644
--- a/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/DescriptionPackage.java
+++ b/plugins/org.eclipse.sirius.tree/src-gen/org/eclipse/sirius/tree/description/DescriptionPackage.java
@@ -486,7 +486,7 @@ public interface DescriptionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
diff --git a/plugins/org.eclipse.sirius/model/viewpoint.ecore b/plugins/org.eclipse.sirius/model/viewpoint.ecore
index afa63a78bd..9671e5d7bb 100644
--- a/plugins/org.eclipse.sirius/model/viewpoint.ecore
+++ b/plugins/org.eclipse.sirius/model/viewpoint.ecore
@@ -1691,20 +1691,20 @@
           </eAnnotations>
         </eStructuralFeatures>
         <eStructuralFeatures xsi:type="ecore:EReference" name="ownedRules" upperBound="-1"
-            eType="#//description/validation/ValidationRule" containment="true">
+            eType="#//description/validation/ValidationRule" containment="true" eKeys="#//description/IdentifiedElement/name">
           <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
             <details key="documentation" value="The validation rules owned by this set."/>
           </eAnnotations>
         </eStructuralFeatures>
         <eStructuralFeatures xsi:type="ecore:EReference" name="reusedRules" upperBound="-1"
-            eType="#//description/validation/ValidationRule">
+            eType="#//description/validation/ValidationRule" eKeys="#//description/IdentifiedElement/name">
           <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
             <details key="documentation" value="The validations rules that are reused by this set."/>
           </eAnnotations>
         </eStructuralFeatures>
         <eStructuralFeatures xsi:type="ecore:EReference" name="allRules" upperBound="-1"
             eType="#//description/validation/ValidationRule" changeable="false" volatile="true"
-            transient="true" derived="true">
+            transient="true" derived="true" eKeys="#//description/IdentifiedElement/name">
           <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
             <details key="documentation" value="All rules of the set."/>
           </eAnnotations>
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/BasicLabelStyle.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/BasicLabelStyle.java
index 5cfa855523..973163cfab 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/BasicLabelStyle.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/BasicLabelStyle.java
@@ -104,7 +104,7 @@ public interface BasicLabelStyle extends Customizable {
      * description here...
      * </p>
      * <!-- end-user-doc -->
-     * 
+     *
      * @return the value of the '<em>Label Color</em>' attribute.
      * @see #setLabelColor(RGBValues)
      * @see org.eclipse.sirius.viewpoint.ViewpointPackage#getBasicLabelStyle_LabelColor()
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/ViewpointPackage.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/ViewpointPackage.java
index c9b52db489..bb04da30fb 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/ViewpointPackage.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/ViewpointPackage.java
@@ -638,7 +638,7 @@ public interface ViewpointPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -707,7 +707,7 @@ public interface ViewpointPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/TypedVariable.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/TypedVariable.java
index ab307f5afd..d9f24f7e41 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/TypedVariable.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/TypedVariable.java
@@ -61,7 +61,7 @@ public interface TypedVariable extends InteractiveVariableDescription, SubVariab
      * here...
      * </p>
      * <!-- end-user-doc --> <!-- begin-model-doc --> The type of the variable value. <!-- end-model-doc -->
-     * 
+     *
      * @return the value of the '<em>Value Type</em>' reference.
      * @see #setValueType(EDataType)
      * @see org.eclipse.sirius.viewpoint.description.DescriptionPackage#getTypedVariable_ValueType()
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/StylePackage.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/StylePackage.java
index c06de4252d..b9f7855d59 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/StylePackage.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/style/StylePackage.java
@@ -100,7 +100,7 @@ public interface StylePackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
@@ -169,7 +169,7 @@ public interface StylePackage extends EPackage {
     /**
      * The feature id for the '<em><b>Label Format</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc
      * -->
-     * 
+     *
      * @generated
      * @ordered
      */
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationPackageImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationPackageImpl.java
index d69dc00b08..0ae7420f42 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationPackageImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/validation/impl/ValidationPackageImpl.java
@@ -486,12 +486,15 @@ public class ValidationPackageImpl extends EPackageImpl implements ValidationPac
         initEReference(getValidationSet_OwnedRules(), this.getValidationRule(), null, "ownedRules", null, 0, -1, ValidationSet.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, //$NON-NLS-1$
                 EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE,
                 EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        getValidationSet_OwnedRules().getEKeys().add(theDescriptionPackage.getIdentifiedElement_Name());
         initEReference(getValidationSet_ReusedRules(), this.getValidationRule(), null, "reusedRules", null, 0, -1, ValidationSet.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, //$NON-NLS-1$
                 EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE,
                 EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        getValidationSet_ReusedRules().getEKeys().add(theDescriptionPackage.getIdentifiedElement_Name());
         initEReference(getValidationSet_AllRules(), this.getValidationRule(), null, "allRules", null, 0, -1, ValidationSet.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, //$NON-NLS-1$
                 !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE,
                 EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
+        getValidationSet_AllRules().getEKeys().add(theDescriptionPackage.getIdentifiedElement_Name());
 
         initEClass(validationRuleEClass, ValidationRule.class, "ValidationRule", EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
         initEAttribute(getValidationRule_Level(), this.getERROR_LEVEL(), "level", "INFO", 1, 1, ValidationRule.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, //$NON-NLS-1$//$NON-NLS-2$