[495811] Correctly unset all features of description elements

Mapping/description import "Spec" classes extend the "Spec" class
implementation of their importable concept and they do not inherit from
the generated "Impl" class corresponding to their EClass generated
interface. 

This commit adds the forgotten code to the eUnset methods. 

Bug: 495811
Change-Id: I167fe70121f275b36c683eaf4b6290d728e8fa91
Signed-off-by: Maxime Porhel <maxime.porhel@obeo.fr>

3 files changed, 44 insertions, 13 deletions

diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/ContainerMappingImportSpec.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/ContainerMappingImportSpec.java
index 17a16631a1..698a0147a5 100644
--- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/ContainerMappingImportSpec.java
+++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/ContainerMappingImportSpec.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2009 THALES GLOBAL SERVICES.
+ * Copyright (c) 2007, 2016 THALES GLOBAL SERVICES.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -52,7 +52,7 @@ public class ContainerMappingImportSpec extends ContainerMappingSpec implements
      * The default value of the '{@link #isInheritsAncestorFilters()
      * <em>Inherits Ancestor Filters</em>}' attribute. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * 
+     *
      * @see #isInheritsAncestorFilters()
      * @generated
      * @ordered
@@ -251,6 +251,7 @@ public class ContainerMappingImportSpec extends ContainerMappingSpec implements
      * 
      * @see org.eclipse.sirius.viewpoint.description.AbstractMappingImport#isHideSubMappings()
      */
+    @Override
     public boolean isHideSubMappings() {
         return hideSubMappings;
     }
@@ -260,6 +261,7 @@ public class ContainerMappingImportSpec extends ContainerMappingSpec implements
      * 
      * @see org.eclipse.sirius.viewpoint.description.AbstractMappingImport#setHideSubMappings(boolean)
      */
+    @Override
     public void setHideSubMappings(final boolean newHideSubMappings) {
         final boolean oldHideSubMappings = hideSubMappings;
         hideSubMappings = newHideSubMappings;
@@ -273,6 +275,7 @@ public class ContainerMappingImportSpec extends ContainerMappingSpec implements
      * 
      * @see org.eclipse.sirius.viewpoint.description.AbstractMappingImport#isInheritsAncestorFilters()
      */
+    @Override
     public boolean isInheritsAncestorFilters() {
         return inheritsAncestorFilters;
     }
@@ -282,6 +285,7 @@ public class ContainerMappingImportSpec extends ContainerMappingSpec implements
      * 
      * @see org.eclipse.sirius.viewpoint.description.AbstractMappingImport#setInheritsAncestorFilters(boolean)
      */
+    @Override
     public void setInheritsAncestorFilters(boolean newInheritsAncestorFilters) {
         boolean oldInheritsAncestorFilters = inheritsAncestorFilters;
         inheritsAncestorFilters = newInheritsAncestorFilters;
@@ -295,6 +299,7 @@ public class ContainerMappingImportSpec extends ContainerMappingSpec implements
      * 
      * @see org.eclipse.sirius.viewpoint.description.ContainerMappingImport#getImportedMapping()
      */
+    @Override
     public ContainerMapping getImportedMapping() {
         if (importedMapping != null && importedMapping.eIsProxy()) {
             final InternalEObject oldImportedMapping = (InternalEObject) importedMapping;
@@ -322,6 +327,7 @@ public class ContainerMappingImportSpec extends ContainerMappingSpec implements
      * 
      * @see org.eclipse.sirius.viewpoint.description.ContainerMappingImport#setImportedMapping(org.eclipse.sirius.viewpoint.description.ContainerMapping)
      */
+    @Override
     public void setImportedMapping(final ContainerMapping newImportedMapping) {
         final ContainerMapping oldImportedMapping = importedMapping;
         importedMapping = newImportedMapping;
@@ -388,8 +394,6 @@ public class ContainerMappingImportSpec extends ContainerMappingSpec implements
         super.eSet(featureID, newValue);
     }
 
-    // CHECKSTYLE:ON
-
     /**
      * {@inheritDoc}
      * 
@@ -401,6 +405,9 @@ public class ContainerMappingImportSpec extends ContainerMappingSpec implements
         case DescriptionPackage.CONTAINER_MAPPING_IMPORT__HIDE_SUB_MAPPINGS:
             setHideSubMappings(HIDE_SUB_MAPPINGS_EDEFAULT);
             return;
+        case DescriptionPackage.CONTAINER_MAPPING_IMPORT__INHERITS_ANCESTOR_FILTERS:
+            setInheritsAncestorFilters(INHERITS_ANCESTOR_FILTERS_EDEFAULT);
+            return;
         case DescriptionPackage.CONTAINER_MAPPING_IMPORT__IMPORTED_MAPPING:
             setImportedMapping((ContainerMapping) null);
             return;
@@ -410,6 +417,8 @@ public class ContainerMappingImportSpec extends ContainerMappingSpec implements
         super.eUnset(featureID);
     }
 
+    // CHECKSTYLE:ON
+
     /**
      * {@inheritDoc}
      * 
@@ -442,8 +451,7 @@ public class ContainerMappingImportSpec extends ContainerMappingSpec implements
      *      java.lang.Class)
      */
     @Override
-    public int eBaseStructuralFeatureID(final int derivedFeatureID, @SuppressWarnings("rawtypes")
-    final Class baseClass) {
+    public int eBaseStructuralFeatureID(final int derivedFeatureID, @SuppressWarnings("rawtypes") final Class baseClass) {
         if (baseClass == AbstractMappingImport.class) {
             int result;
             switch (derivedFeatureID) {
@@ -469,8 +477,7 @@ public class ContainerMappingImportSpec extends ContainerMappingSpec implements
      *      java.lang.Class)
      */
     @Override
-    public int eDerivedStructuralFeatureID(final int baseFeatureID, @SuppressWarnings("rawtypes")
-    final Class baseClass) {
+    public int eDerivedStructuralFeatureID(final int baseFeatureID, @SuppressWarnings("rawtypes") final Class baseClass) {
         if (baseClass == AbstractMappingImport.class) {
             int result;
             switch (baseFeatureID) {
diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/DiagramImportDescriptionSpec.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/DiagramImportDescriptionSpec.java
index 4c3aeb7f31..5261c483b5 100644
--- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/DiagramImportDescriptionSpec.java
+++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/DiagramImportDescriptionSpec.java
@@ -59,6 +59,7 @@ public class DiagramImportDescriptionSpec extends DiagramDescriptionSpec impleme
      * 
      * @see org.eclipse.sirius.viewpoint.description.DiagramDescription#getImportedDiagram()
      */
+    @Override
     public DiagramDescription getImportedDiagram() {
         if (importedDiagramDescription != null && importedDiagramDescription.eIsProxy()) {
             final InternalEObject oldDiagramDescription = (InternalEObject) importedDiagramDescription;
@@ -77,6 +78,7 @@ public class DiagramImportDescriptionSpec extends DiagramDescriptionSpec impleme
      * 
      * @see org.eclipse.sirius.viewpoint.description.DiagramImportDescription#setImportedDiagram(org.eclipse.sirius.viewpoint.description.DiagramDescription)
      */
+    @Override
     public void setImportedDiagram(final DiagramDescription value) {
         final DiagramDescription oldImportedDescription = importedDiagramDescription;
         importedDiagramDescription = value;
@@ -131,6 +133,23 @@ public class DiagramImportDescriptionSpec extends DiagramDescriptionSpec impleme
 
     /**
      * {@inheritDoc}
+     *
+     * @see org.eclipse.sirius.viewpoint.description.impl.DiagramDescriptionImpl#eUnset()
+     */
+    @Override
+    public void eUnset(int featureID) {
+        switch (featureID) {
+        case DescriptionPackage.DIAGRAM_IMPORT_DESCRIPTION__IMPORTED_DIAGRAM:
+            setImportedDiagram((DiagramDescription) null);
+            return;
+        default:
+            break;
+        }
+        super.eUnset(featureID);
+    }
+
+    /**
+     * {@inheritDoc}
      * 
      * @see org.eclipse.sirius.viewpoint.description.impl.DiagramDescriptionImpl#getDefaultLayer()
      */
diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/NodeMappingImportSpec.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/NodeMappingImportSpec.java
index 67ad65d75d..805d4b7e6b 100644
--- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/NodeMappingImportSpec.java
+++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/NodeMappingImportSpec.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2009 THALES GLOBAL SERVICES.
+ * Copyright (c) 2007, 2016 THALES GLOBAL SERVICES.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -112,6 +112,7 @@ public class NodeMappingImportSpec extends NodeMappingSpec implements NodeMappin
             getImportedMapping().addDoneNode(node);
         }
     }
+
     /**
      * {@inheritDoc}
      * 
@@ -230,6 +231,7 @@ public class NodeMappingImportSpec extends NodeMappingSpec implements NodeMappin
      * 
      * @see org.eclipse.sirius.viewpoint.description.NodeMappingImport#getImportedMapping()
      */
+    @Override
     public NodeMapping getImportedMapping() {
         if (importedMapping != null && importedMapping.eIsProxy()) {
             final InternalEObject oldImportedMapping = (InternalEObject) importedMapping;
@@ -257,6 +259,7 @@ public class NodeMappingImportSpec extends NodeMappingSpec implements NodeMappin
      * 
      * @see org.eclipse.sirius.viewpoint.description.NodeMappingImport#setImportedMapping(org.eclipse.sirius.viewpoint.description.NodeMapping)
      */
+    @Override
     public void setImportedMapping(final NodeMapping newImportedMapping) {
         final NodeMapping oldImportedMapping = importedMapping;
         importedMapping = newImportedMapping;
@@ -384,8 +387,7 @@ public class NodeMappingImportSpec extends NodeMappingSpec implements NodeMappin
      *      java.lang.Class)
      */
     @Override
-    public int eBaseStructuralFeatureID(final int derivedFeatureID, @SuppressWarnings("rawtypes")
-    final Class baseClass) {
+    public int eBaseStructuralFeatureID(final int derivedFeatureID, @SuppressWarnings("rawtypes") final Class baseClass) {
         if (baseClass == AbstractMappingImport.class) {
             int result;
             switch (derivedFeatureID) {
@@ -411,8 +413,7 @@ public class NodeMappingImportSpec extends NodeMappingSpec implements NodeMappin
      *      java.lang.Class)
      */
     @Override
-    public int eDerivedStructuralFeatureID(final int baseFeatureID, @SuppressWarnings("rawtypes")
-    final Class baseClass) {
+    public int eDerivedStructuralFeatureID(final int baseFeatureID, @SuppressWarnings("rawtypes") final Class baseClass) {
         if (baseClass == AbstractMappingImport.class) {
             int result;
             switch (baseFeatureID) {
@@ -436,6 +437,7 @@ public class NodeMappingImportSpec extends NodeMappingSpec implements NodeMappin
      * 
      * @see org.eclipse.sirius.viewpoint.description.AbstractMappingImport#isHideSubMappings()
      */
+    @Override
     public boolean isHideSubMappings() {
         return hideSubMappings;
     }
@@ -445,6 +447,7 @@ public class NodeMappingImportSpec extends NodeMappingSpec implements NodeMappin
      * 
      * @see org.eclipse.sirius.viewpoint.description.AbstractMappingImport#setHideSubMappings(boolean)
      */
+    @Override
     public void setHideSubMappings(final boolean newHideSubMappings) {
         final boolean oldHideSubMappings = hideSubMappings;
         hideSubMappings = newHideSubMappings;
@@ -458,6 +461,7 @@ public class NodeMappingImportSpec extends NodeMappingSpec implements NodeMappin
      * 
      * @see org.eclipse.sirius.viewpoint.description.AbstractMappingImport#isInheritsAncestorFilters()
      */
+    @Override
     public boolean isInheritsAncestorFilters() {
         return inheritsAncestorFilters;
     }
@@ -467,6 +471,7 @@ public class NodeMappingImportSpec extends NodeMappingSpec implements NodeMappin
      * 
      * @see org.eclipse.sirius.viewpoint.description.AbstractMappingImport#setInheritsAncestorFilters(boolean)
      */
+    @Override
     public void setInheritsAncestorFilters(boolean newInheritsAncestorFilters) {
         boolean oldInheritsAncestorFilters = inheritsAncestorFilters;
         inheritsAncestorFilters = newInheritsAncestorFilters;