[525261] Make remaining classes inherit from IdentifiedElement

* This commit completes the MM changes done in commit
d314a1effab4083901b47a5c987b603548c5daac for DAnnotation,
DAnnotationEntry, AnnotationEntry
* Complete MMTest to check referenced element, in addition to EClass.

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

16 files changed, 136 insertions, 60 deletions

diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/mm/MMTest.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/mm/MMTest.java
index 48ca600feb..2405144dbe 100644
--- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/mm/MMTest.java
+++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/mm/MMTest.java
@@ -12,11 +12,15 @@ package org.eclipse.sirius.tests.unit.api.mm;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.stream.Collectors;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.sirius.common.tools.api.util.StringUtil;
 import org.eclipse.sirius.diagram.DDiagram;
@@ -36,6 +40,7 @@ import org.eclipse.sirius.tree.description.TreeCreationDescription;
 import org.eclipse.sirius.tree.description.TreeNavigationDescription;
 import org.eclipse.sirius.viewpoint.IdentifiedElement;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
+import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
 import org.eclipse.sirius.viewpoint.description.tool.ToolEntry;
 
 /**
@@ -62,7 +67,7 @@ public class MMTest extends SiriusDiagramTestCase {
 
     private static final List<EClass> TRANSIENT_OBJECTS_WHITE_LIST = Arrays.asList(ViewpointPackage.eINSTANCE.getDAnalysisSessionEObject(), ViewpointPackage.eINSTANCE.getUIState(),
             ViewpointPackage.eINSTANCE.getSessionManagerEObject(), ViewpointPackage.eINSTANCE.getToolInstance(), ViewpointPackage.eINSTANCE.getToolGroupInstance(),
-            ViewpointPackage.eINSTANCE.getToolSectionInstance());
+            ViewpointPackage.eINSTANCE.getToolSectionInstance(), EcorePackage.eINSTANCE.getEStringToStringMapEntry(), EcorePackage.eINSTANCE.getEObject());
 
     @Override
     protected void setUp() throws Exception {
@@ -112,6 +117,8 @@ public class MMTest extends SiriusDiagramTestCase {
         allClassifiers.addAll(TreePackage.eINSTANCE.getEClassifiers());
         allClassifiers.addAll(TablePackage.eINSTANCE.getEClassifiers());
         allClassifiers.addAll(SequencePackage.eINSTANCE.getEClassifiers());
+        allClassifiers.add(DescriptionPackage.eINSTANCE.getAnnotationEntry());
+        allClassifiers.add(DescriptionPackage.eINSTANCE.getDAnnotation());
 
         List<EClass> allClasses = allClassifiers.stream().filter(EClass.class::isInstance).map(EClass.class::cast).filter(cl -> !cl.isInterface()).collect(Collectors.toList());
 
@@ -119,21 +126,34 @@ public class MMTest extends SiriusDiagramTestCase {
 
         List<String> invalidEClasses = new ArrayList<>();
         List<String> invalidInstances = new ArrayList<>();
+        Collection<String> externalEClasses = new LinkedHashSet<>();
         for (EClass eClass : allClasses) {
-            Class<?> instanceClass = eClass.getInstanceClass();
-            if (!IdentifiedElement.class.isAssignableFrom(instanceClass)) {
-                invalidEClasses.add(eClass.getName());
-            } else if (!eClass.isAbstract() && !eClass.isInterface()) {
-                IdentifiedElement identifiedElement = (IdentifiedElement) EcoreUtil.create(eClass);
-                String uid = identifiedElement.getUid();
-                if (StringUtil.isEmpty(uid) || uid.length() != uuidLength) {
-                    invalidInstances.add(eClass.getName());
+            checkEClass(eClass, invalidEClasses, invalidInstances, uuidLength);
+
+            for (EReference containmentRef : eClass.getEAllContainments()) {
+                EClass eReferenceType = containmentRef.getEReferenceType();
+                if (!containmentRef.isTransient() && !eReferenceType.isInterface() && !allClasses.contains(eReferenceType) && !TRANSIENT_OBJECTS_WHITE_LIST.contains(eReferenceType)) {
+                    // EClass from a non tested EPackage
+                    checkEClass(eReferenceType, externalEClasses, invalidInstances, uuidLength);
                 }
             }
         }
 
         assertTrue("The following classes should inherit from IdentifiedElement class:\n" + invalidEClasses, invalidEClasses.isEmpty());
         assertTrue("The instances of the following classes should have an uid after creation:\n" + invalidInstances, invalidInstances.isEmpty());
+        assertTrue("The following classes should be inspected. They might require to become subtypes of IdentifiedElementQuery:\n" + externalEClasses, externalEClasses.isEmpty());
+    }
+
+    private void checkEClass(EClass eClass, Collection<String> invalidEClasses, Collection<String> invalidInstances, int uuidLength) {
+        if (!ViewpointPackage.eINSTANCE.getIdentifiedElement().isSuperTypeOf(eClass)) {
+            invalidEClasses.add(eClass.getName());
+        } else if (!eClass.isAbstract() && !eClass.isInterface()) {
+            IdentifiedElement identifiedElement = (IdentifiedElement) EcoreUtil.create(eClass);
+            String uid = identifiedElement.getUid();
+            if (StringUtil.isEmpty(uid) || uid.length() != uuidLength) {
+                invalidInstances.add(eClass.getName());
+            }
+        }
     }
 
 }
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/AnnotationEntryItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/AnnotationEntryItemProvider.java
index 3d2fe35020..7349d27fda 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/AnnotationEntryItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/AnnotationEntryItemProvider.java
@@ -21,17 +21,12 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.EcoreFactory;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.sirius.viewpoint.description.AnnotationEntry;
 import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
+import org.eclipse.sirius.viewpoint.provider.IdentifiedElementItemProvider;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.sirius.viewpoint.description.AnnotationEntry} object. <!--
@@ -39,8 +34,7 @@ import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
  *
  * @generated
  */
-public class AnnotationEntryItemProvider extends ItemProviderAdapter
-        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class AnnotationEntryItemProvider extends IdentifiedElementItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -120,7 +114,7 @@ public class AnnotationEntryItemProvider extends ItemProviderAdapter
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
-     * @generated
+     * @generated NOT
      */
     @Override
     public String getText(Object object) {
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DAnnotationEntryItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DAnnotationEntryItemProvider.java
index 4e4f443740..4a9c63bbe0 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DAnnotationEntryItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DAnnotationEntryItemProvider.java
@@ -19,17 +19,12 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.util.ResourceLocator;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.sirius.viewpoint.description.DAnnotationEntry;
 import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
+import org.eclipse.sirius.viewpoint.provider.IdentifiedElementItemProvider;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.sirius.viewpoint.description.DAnnotationEntry} object.
@@ -37,8 +32,7 @@ import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
  *
  * @generated
  */
-public class DAnnotationEntryItemProvider extends ItemProviderAdapter
-        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class DAnnotationEntryItemProvider extends IdentifiedElementItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -101,7 +95,7 @@ public class DAnnotationEntryItemProvider extends ItemProviderAdapter
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
-     * @generated
+     * @generated NOT
      */
     @Override
     public String getText(Object object) {
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DAnnotationItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DAnnotationItemProvider.java
index 8f1023ca8b..b7df0d6b7f 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DAnnotationItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DAnnotationItemProvider.java
@@ -22,17 +22,12 @@ import org.eclipse.emf.ecore.EcoreFactory;
 import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.sirius.viewpoint.description.DAnnotation;
 import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
+import org.eclipse.sirius.viewpoint.provider.IdentifiedElementItemProvider;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.sirius.viewpoint.description.DAnnotation} object. <!--
@@ -40,8 +35,7 @@ import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
  *
  * @generated
  */
-public class DAnnotationItemProvider extends ItemProviderAdapter
-        implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class DAnnotationItemProvider extends IdentifiedElementItemProvider {
     /**
      * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -134,7 +128,7 @@ public class DAnnotationItemProvider extends ItemProviderAdapter
     /**
      * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
-     * @generated
+     * @generated NOT
      */
     @Override
     public String getText(Object object) {
diff --git a/plugins/org.eclipse.sirius/model/viewpoint.ecore b/plugins/org.eclipse.sirius/model/viewpoint.ecore
index 341613c306..a9c99aa489 100644
--- a/plugins/org.eclipse.sirius/model/viewpoint.ecore
+++ b/plugins/org.eclipse.sirius/model/viewpoint.ecore
@@ -523,7 +523,7 @@
       <eStructuralFeatures xsi:type="ecore:EReference" name="eAnnotations" upperBound="-1"
           eType="#//description/DAnnotation" containment="true" resolveProxies="false"/>
     </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="DAnnotation">
+    <eClassifiers xsi:type="ecore:EClass" name="DAnnotation" eSuperTypes="#//IdentifiedElement">
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="source" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="details" upperBound="-1"
           eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EStringToStringMapEntry"
@@ -892,7 +892,7 @@
       <eStructuralFeatures xsi:type="ecore:EReference" name="entries" upperBound="-1"
           eType="#//description/UserColor" containment="true" eKeys="#//description/UserColor/name"/>
     </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="AnnotationEntry">
+    <eClassifiers xsi:type="ecore:EClass" name="AnnotationEntry" eSuperTypes="#//IdentifiedElement">
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="source" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="data" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"
           containment="true" resolveProxies="false"/>
@@ -948,7 +948,7 @@
         <eAnnotations source="http://www.eclipse.org/sirius/interpreted/expression/variables"/>
       </eStructuralFeatures>
     </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="DAnnotationEntry">
+    <eClassifiers xsi:type="ecore:EClass" name="DAnnotationEntry" eSuperTypes="#//IdentifiedElement">
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="source" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="details" upperBound="-1"
           eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/AnnotationEntry.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/AnnotationEntry.java
index 56b5c168cb..1c6e466525 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/AnnotationEntry.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/AnnotationEntry.java
@@ -12,6 +12,7 @@
 package org.eclipse.sirius.viewpoint.description;
 
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.sirius.viewpoint.IdentifiedElement;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Annotation Entry</b></em>'. <!-- end-user-doc
@@ -29,7 +30,7 @@ import org.eclipse.emf.ecore.EObject;
  * @model
  * @generated
  */
-public interface AnnotationEntry extends EObject {
+public interface AnnotationEntry extends IdentifiedElement {
     /**
      * Returns the value of the '<em><b>Source</b></em>' attribute. <!-- begin-user-doc -->
      * <p>
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DAnnotation.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DAnnotation.java
index 707de23aa7..7d186cfa22 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DAnnotation.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DAnnotation.java
@@ -14,6 +14,7 @@ package org.eclipse.sirius.viewpoint.description;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.common.util.EMap;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.sirius.viewpoint.IdentifiedElement;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object ' <em><b>DAnnotation</b></em>'. <!-- end-user-doc -->
@@ -31,7 +32,7 @@ import org.eclipse.emf.ecore.EObject;
  * @model
  * @generated
  */
-public interface DAnnotation extends EObject {
+public interface DAnnotation extends IdentifiedElement {
     /**
      * Returns the value of the '<em><b>Source</b></em>' attribute. <!-- begin-user-doc -->
      * <p>
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DAnnotationEntry.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DAnnotationEntry.java
index e73ba9ef8e..abe640825f 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DAnnotationEntry.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DAnnotationEntry.java
@@ -12,7 +12,7 @@
 package org.eclipse.sirius.viewpoint.description;
 
 import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
+import org.eclipse.sirius.viewpoint.IdentifiedElement;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object ' <em><b>DAnnotation Entry</b></em>'. <!-- end-user-doc
@@ -30,7 +30,7 @@ import org.eclipse.emf.ecore.EObject;
  * @model
  * @generated
  */
-public interface DAnnotationEntry extends EObject {
+public interface DAnnotationEntry extends IdentifiedElement {
     /**
      * Returns the value of the '<em><b>Source</b></em>' attribute. <!-- begin-user-doc -->
      * <p>
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DescriptionPackage.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DescriptionPackage.java
index 8fdceafb4e..5abf4785ed 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DescriptionPackage.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DescriptionPackage.java
@@ -17,6 +17,7 @@ import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
+import org.eclipse.sirius.viewpoint.ViewpointPackage;
 
 /**
  * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains accessors for the meta objects to represent
@@ -867,12 +868,20 @@ public interface DescriptionPackage extends EPackage {
     int DANNOTATION = 15;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DANNOTATION__UID = ViewpointPackage.IDENTIFIED_ELEMENT__UID;
+
+    /**
      * The feature id for the '<em><b>Source</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
      * @ordered
      */
-    int DANNOTATION__SOURCE = 0;
+    int DANNOTATION__SOURCE = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 0;
 
     /**
      * The feature id for the '<em><b>Details</b></em>' map. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -880,7 +889,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DANNOTATION__DETAILS = 1;
+    int DANNOTATION__DETAILS = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 1;
 
     /**
      * The feature id for the '<em><b>References</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -888,7 +897,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DANNOTATION__REFERENCES = 2;
+    int DANNOTATION__REFERENCES = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 2;
 
     /**
      * The number of structural features of the '<em>DAnnotation</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
@@ -897,7 +906,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DANNOTATION_FEATURE_COUNT = 3;
+    int DANNOTATION_FEATURE_COUNT = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 3;
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.viewpoint.description.impl.ConditionalStyleDescriptionImpl
@@ -1942,12 +1951,20 @@ public interface DescriptionPackage extends EPackage {
     int ANNOTATION_ENTRY = 40;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int ANNOTATION_ENTRY__UID = ViewpointPackage.IDENTIFIED_ELEMENT__UID;
+
+    /**
      * The feature id for the '<em><b>Source</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
      * @ordered
      */
-    int ANNOTATION_ENTRY__SOURCE = 0;
+    int ANNOTATION_ENTRY__SOURCE = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 0;
 
     /**
      * The feature id for the '<em><b>Data</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc
@@ -1956,7 +1973,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int ANNOTATION_ENTRY__DATA = 1;
+    int ANNOTATION_ENTRY__DATA = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 1;
 
     /**
      * The number of structural features of the '<em>Annotation Entry</em>' class. <!-- begin-user-doc --> <!--
@@ -1965,7 +1982,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int ANNOTATION_ENTRY_FEATURE_COUNT = 2;
+    int ANNOTATION_ENTRY_FEATURE_COUNT = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 2;
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.viewpoint.description.impl.EndUserDocumentedElementImpl
@@ -2057,12 +2074,20 @@ public interface DescriptionPackage extends EPackage {
     int DANNOTATION_ENTRY = 44;
 
     /**
+     * The feature id for the '<em><b>Uid</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+     *
+     * @generated
+     * @ordered
+     */
+    int DANNOTATION_ENTRY__UID = ViewpointPackage.IDENTIFIED_ELEMENT__UID;
+
+    /**
      * The feature id for the '<em><b>Source</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
      * @ordered
      */
-    int DANNOTATION_ENTRY__SOURCE = 0;
+    int DANNOTATION_ENTRY__SOURCE = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 0;
 
     /**
      * The feature id for the '<em><b>Details</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -2070,7 +2095,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DANNOTATION_ENTRY__DETAILS = 1;
+    int DANNOTATION_ENTRY__DETAILS = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 1;
 
     /**
      * The number of structural features of the '<em>DAnnotation Entry</em>' class. <!-- begin-user-doc --> <!--
@@ -2079,7 +2104,7 @@ public interface DescriptionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int DANNOTATION_ENTRY_FEATURE_COUNT = 2;
+    int DANNOTATION_ENTRY_FEATURE_COUNT = ViewpointPackage.IDENTIFIED_ELEMENT_FEATURE_COUNT + 2;
 
     /**
      * The meta object id for the '{@link org.eclipse.sirius.viewpoint.description.impl.AbstractVariableImpl
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/AnnotationEntryImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/AnnotationEntryImpl.java
index 111891ce8a..713bfdd967 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/AnnotationEntryImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/AnnotationEntryImpl.java
@@ -17,9 +17,9 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.sirius.viewpoint.description.AnnotationEntry;
 import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
+import org.eclipse.sirius.viewpoint.impl.IdentifiedElementImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Annotation Entry</b></em>'. <!-- end-user-doc
@@ -34,7 +34,7 @@ import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
  *
  * @generated
  */
-public class AnnotationEntryImpl extends MinimalEObjectImpl.Container implements AnnotationEntry {
+public class AnnotationEntryImpl extends IdentifiedElementImpl implements AnnotationEntry {
     /**
      * The default value of the '{@link #getSource() <em>Source</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DAnnotationEntryImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DAnnotationEntryImpl.java
index fc14e68089..58e7326c53 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DAnnotationEntryImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DAnnotationEntryImpl.java
@@ -17,10 +17,10 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
 import org.eclipse.sirius.viewpoint.description.DAnnotationEntry;
 import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
+import org.eclipse.sirius.viewpoint.impl.IdentifiedElementImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>DAnnotation Entry</b></em>'. <!-- end-user-doc
@@ -35,7 +35,7 @@ import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
  *
  * @generated
  */
-public class DAnnotationEntryImpl extends MinimalEObjectImpl.Container implements DAnnotationEntry {
+public class DAnnotationEntryImpl extends IdentifiedElementImpl implements DAnnotationEntry {
     /**
      * The default value of the '{@link #getSource() <em>Source</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DAnnotationImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DAnnotationImpl.java
index e6d47b3bc8..c618535f3b 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DAnnotationImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DAnnotationImpl.java
@@ -24,12 +24,12 @@ import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EStringToStringMapEntryImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 import org.eclipse.emf.ecore.util.EcoreEMap;
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.sirius.viewpoint.description.DAnnotation;
 import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
+import org.eclipse.sirius.viewpoint.impl.IdentifiedElementImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>DAnnotation</b></em>'. <!-- end-user-doc -->
@@ -44,7 +44,7 @@ import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
  *
  * @generated
  */
-public class DAnnotationImpl extends MinimalEObjectImpl.Container implements DAnnotation {
+public class DAnnotationImpl extends IdentifiedElementImpl implements DAnnotation {
     /**
      * The default value of the '{@link #getSource() <em>Source</em>}' attribute. <!-- begin-user-doc --> <!--
      * end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DescriptionPackageImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DescriptionPackageImpl.java
index 58c5969d6d..fe07ccd820 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DescriptionPackageImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DescriptionPackageImpl.java
@@ -2409,6 +2409,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
         ValidationPackage theValidationPackage = (ValidationPackage) EPackage.Registry.INSTANCE.getEPackage(ValidationPackage.eNS_URI);
         AuditPackage theAuditPackage = (AuditPackage) EPackage.Registry.INSTANCE.getEPackage(AuditPackage.eNS_URI);
         EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+        ViewpointPackage theViewpointPackage = (ViewpointPackage) EPackage.Registry.INSTANCE.getEPackage(ViewpointPackage.eNS_URI);
 
         // Add subpackages
         getESubpackages().add(theStylePackage);
@@ -2432,6 +2433,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
         representationDescriptionEClass.getESuperTypes().add(this.getIdentifiedElement());
         representationImportDescriptionEClass.getESuperTypes().add(this.getRepresentationDescription());
         representationElementMappingEClass.getESuperTypes().add(this.getIdentifiedElement());
+        dAnnotationEClass.getESuperTypes().add(theViewpointPackage.getIdentifiedElement());
         semanticBasedDecorationEClass.getESuperTypes().add(this.getDecorationDescription());
         genericDecorationDescriptionEClass.getESuperTypes().add(this.getDecorationDescription());
         vsmElementCustomizationEClass.getESuperTypes().add(this.getIVSMElementCustomization());
@@ -2444,8 +2446,10 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
         fixedColorEClass.getESuperTypes().add(this.getColorDescription());
         userFixedColorEClass.getESuperTypes().add(this.getFixedColor());
         userFixedColorEClass.getESuperTypes().add(this.getUserColor());
+        annotationEntryEClass.getESuperTypes().add(theViewpointPackage.getIdentifiedElement());
         computedColorEClass.getESuperTypes().add(this.getUserColor());
         computedColorEClass.getESuperTypes().add(this.getColorDescription());
+        dAnnotationEntryEClass.getESuperTypes().add(theViewpointPackage.getIdentifiedElement());
         subVariableEClass.getESuperTypes().add(this.getAbstractVariable());
         typedVariableEClass.getESuperTypes().add(this.getInteractiveVariableDescription());
         typedVariableEClass.getESuperTypes().add(this.getSubVariable());
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/util/DescriptionAdapterFactory.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/util/DescriptionAdapterFactory.java
index d17b4c8a81..be5f3be8f4 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/util/DescriptionAdapterFactory.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/util/DescriptionAdapterFactory.java
@@ -363,6 +363,11 @@ public class DescriptionAdapterFactory extends AdapterFactoryImpl {
         }
 
         @Override
+        public Adapter caseViewpoint_IdentifiedElement(org.eclipse.sirius.viewpoint.IdentifiedElement object) {
+            return createViewpoint_IdentifiedElementAdapter();
+        }
+
+        @Override
         public Adapter defaultCase(EObject object) {
             return createEObjectAdapter();
         }
@@ -1065,6 +1070,20 @@ public class DescriptionAdapterFactory extends AdapterFactoryImpl {
     }
 
     /**
+     * Creates a new adapter for an object of class '{@link org.eclipse.sirius.viewpoint.IdentifiedElement
+     * <em>Identified Element</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+     * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
+     * end-user-doc -->
+     *
+     * @return the new adapter.
+     * @see org.eclipse.sirius.viewpoint.IdentifiedElement
+     * @generated
+     */
+    public Adapter createViewpoint_IdentifiedElementAdapter() {
+        return null;
+    }
+
+    /**
      * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null.
      * <!-- end-user-doc -->
      *
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/util/DescriptionSwitch.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/util/DescriptionSwitch.java
index 0163cc90a4..47cd221cc7 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/util/DescriptionSwitch.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/util/DescriptionSwitch.java
@@ -296,6 +296,9 @@ public class DescriptionSwitch<T> {
             DAnnotation dAnnotation = (DAnnotation) theEObject;
             T result = caseDAnnotation(dAnnotation);
             if (result == null) {
+                result = caseViewpoint_IdentifiedElement(dAnnotation);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -538,6 +541,9 @@ public class DescriptionSwitch<T> {
             AnnotationEntry annotationEntry = (AnnotationEntry) theEObject;
             T result = caseAnnotationEntry(annotationEntry);
             if (result == null) {
+                result = caseViewpoint_IdentifiedElement(annotationEntry);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -576,6 +582,9 @@ public class DescriptionSwitch<T> {
             DAnnotationEntry dAnnotationEntry = (DAnnotationEntry) theEObject;
             T result = caseDAnnotationEntry(dAnnotationEntry);
             if (result == null) {
+                result = caseViewpoint_IdentifiedElement(dAnnotationEntry);
+            }
+            if (result == null) {
                 result = defaultCase(theEObject);
             }
             return result;
@@ -1353,6 +1362,21 @@ public class DescriptionSwitch<T> {
     }
 
     /**
+     * Returns the result of interpreting the object as an instance of '<em>Identified Element</em>'. <!--
+     * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
+     * end-user-doc -->
+     *
+     * @param object
+     *            the target of the switch.
+     * @return the result of interpreting the object as an instance of '<em>Identified Element</em>'.
+     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+     * @generated
+     */
+    public T caseViewpoint_IdentifiedElement(org.eclipse.sirius.viewpoint.IdentifiedElement object) {
+        return null;
+    }
+
+    /**
      * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This
      * implementation returns null; returning a non-null result will terminate the switch, but this is the last case
      * anyway. <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/TechnicalUidMigrationParticipant.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/TechnicalUidMigrationParticipant.java
index e25192580d..e42587e0f7 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/TechnicalUidMigrationParticipant.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/TechnicalUidMigrationParticipant.java
@@ -32,7 +32,7 @@ public class TechnicalUidMigrationParticipant extends AbstractRepresentationsFil
     /**
      * The VP version for which this migration is added.
      */
-    public static final Version MIGRATION_VERSION = new Version("14.1.0.201808080808"); //$NON-NLS-1$
+    public static final Version MIGRATION_VERSION = new Version("14.1.0.201808300808"); //$NON-NLS-1$
 
     private boolean migrationOccured;