[422260] Remove Contribution duplicated classes.

Move classes from org.eclipse.sirius.viewpoint.description.contribution
to org.eclipse.sirius.description.contribution namespace.

Remove the generated copyright field.
Update the edit plugin id in genmodel and the editPluginClass to
minimize the regeneration differences.

Change-Id: I22186cd9992060f2a695f74236e6a51d2d4b0d4b

19 files changed, 34 insertions, 34 deletions

diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/contribution/computedeobjectreference/ComputedEObjectReferenceValueExpressionFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/contribution/computedeobjectreference/ComputedEObjectReferenceValueExpressionFilter.java
index 6ad3ab2634..3d6228a0ee 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/contribution/computedeobjectreference/ComputedEObjectReferenceValueExpressionFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/contribution/computedeobjectreference/ComputedEObjectReferenceValueExpressionFilter.java
@@ -13,8 +13,8 @@ package org.eclipse.sirius.editor.properties.filters.contribution.computedeobjec
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.description.contribution.ContributionPackage;
 import org.eclipse.sirius.editor.properties.filters.common.ContributionPropertyFilter;
-import org.eclipse.sirius.viewpoint.description.contribution.ContributionPackage;
 
 // End of user code specific imports
 
@@ -34,7 +34,7 @@ public class ComputedEObjectReferenceValueExpressionFilter extends ContributionP
      * {@inheritDoc}
      */
     protected boolean isRightInputType(Object arg0) {
-        return arg0 instanceof org.eclipse.sirius.viewpoint.description.contribution.ComputedEObjectReference;
+        return arg0 instanceof org.eclipse.sirius.description.contribution.ComputedEObjectReference;
     }
 
     // Start of user code user methods
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/contribution/contribution/ContributionDescriptionFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/contribution/contribution/ContributionDescriptionFilter.java
index 01d7001ca0..6bb5ca98de 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/contribution/contribution/ContributionDescriptionFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/contribution/contribution/ContributionDescriptionFilter.java
@@ -13,8 +13,8 @@ package org.eclipse.sirius.editor.properties.filters.contribution.contribution;
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.description.contribution.ContributionPackage;
 import org.eclipse.sirius.editor.properties.filters.common.ContributionPropertyFilter;
-import org.eclipse.sirius.viewpoint.description.contribution.ContributionPackage;
 
 // End of user code specific imports
 
@@ -34,7 +34,7 @@ public class ContributionDescriptionFilter extends ContributionPropertyFilter {
      * {@inheritDoc}
      */
     protected boolean isRightInputType(Object arg0) {
-        return arg0 instanceof org.eclipse.sirius.viewpoint.description.contribution.Contribution;
+        return arg0 instanceof org.eclipse.sirius.description.contribution.Contribution;
     }
 
     // Start of user code user methods
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/contribution/contribution/ContributionSubContributionsFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/contribution/contribution/ContributionSubContributionsFilter.java
index fc70a09898..89bc4b1321 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/contribution/contribution/ContributionSubContributionsFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/contribution/contribution/ContributionSubContributionsFilter.java
@@ -13,8 +13,8 @@ package org.eclipse.sirius.editor.properties.filters.contribution.contribution;
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.description.contribution.ContributionPackage;
 import org.eclipse.sirius.editor.properties.filters.common.ContributionPropertyFilter;
-import org.eclipse.sirius.viewpoint.description.contribution.ContributionPackage;
 
 // End of user code specific imports
 
@@ -34,7 +34,7 @@ public class ContributionSubContributionsFilter extends ContributionPropertyFilt
      * {@inheritDoc}
      */
     protected boolean isRightInputType(Object arg0) {
-        return arg0 instanceof org.eclipse.sirius.viewpoint.description.contribution.Contribution;
+        return arg0 instanceof org.eclipse.sirius.description.contribution.Contribution;
     }
 
     // Start of user code user methods
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/contribution/contribution/ContributionTargetFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/contribution/contribution/ContributionTargetFilter.java
index 30f22622e7..900b73f95e 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/contribution/contribution/ContributionTargetFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/contribution/contribution/ContributionTargetFilter.java
@@ -13,8 +13,8 @@ package org.eclipse.sirius.editor.properties.filters.contribution.contribution;
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.description.contribution.ContributionPackage;
 import org.eclipse.sirius.editor.properties.filters.common.ContributionPropertyFilter;
-import org.eclipse.sirius.viewpoint.description.contribution.ContributionPackage;
 
 // End of user code specific imports
 
@@ -34,7 +34,7 @@ public class ContributionTargetFilter extends ContributionPropertyFilter {
      * {@inheritDoc}
      */
     protected boolean isRightInputType(Object arg0) {
-        return arg0 instanceof org.eclipse.sirius.viewpoint.description.contribution.Contribution;
+        return arg0 instanceof org.eclipse.sirius.description.contribution.Contribution;
     }
 
     // Start of user code user methods
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/contribution/contributionpoint/ContributionPointContributedFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/contribution/contributionpoint/ContributionPointContributedFilter.java
index 93f8d82502..1f013c1c8c 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/contribution/contributionpoint/ContributionPointContributedFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/contribution/contributionpoint/ContributionPointContributedFilter.java
@@ -13,8 +13,8 @@ package org.eclipse.sirius.editor.properties.filters.contribution.contributionpo
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.description.contribution.ContributionPackage;
 import org.eclipse.sirius.editor.properties.filters.common.ContributionPropertyFilter;
-import org.eclipse.sirius.viewpoint.description.contribution.ContributionPackage;
 
 // End of user code specific imports
 
@@ -34,7 +34,7 @@ public class ContributionPointContributedFilter extends ContributionPropertyFilt
      * {@inheritDoc}
      */
     protected boolean isRightInputType(Object arg0) {
-        return arg0 instanceof org.eclipse.sirius.viewpoint.description.contribution.ContributionPoint;
+        return arg0 instanceof org.eclipse.sirius.description.contribution.ContributionPoint;
     }
 
     // Start of user code user methods
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/contribution/contributionpoint/ContributionPointOriginFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/contribution/contributionpoint/ContributionPointOriginFilter.java
index c9f9f881e5..e165e9b9cc 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/contribution/contributionpoint/ContributionPointOriginFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/contribution/contributionpoint/ContributionPointOriginFilter.java
@@ -13,8 +13,8 @@ package org.eclipse.sirius.editor.properties.filters.contribution.contributionpo
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.description.contribution.ContributionPackage;
 import org.eclipse.sirius.editor.properties.filters.common.ContributionPropertyFilter;
-import org.eclipse.sirius.viewpoint.description.contribution.ContributionPackage;
 
 // End of user code specific imports
 
@@ -34,7 +34,7 @@ public class ContributionPointOriginFilter extends ContributionPropertyFilter {
      * {@inheritDoc}
      */
     protected boolean isRightInputType(Object arg0) {
-        return arg0 instanceof org.eclipse.sirius.viewpoint.description.contribution.ContributionPoint;
+        return arg0 instanceof org.eclipse.sirius.description.contribution.ContributionPoint;
     }
 
     // Start of user code user methods
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/contribution/directeobjectreference/DirectEObjectReferenceValueFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/contribution/directeobjectreference/DirectEObjectReferenceValueFilter.java
index 7d7ac62516..e5c8eb59f6 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/contribution/directeobjectreference/DirectEObjectReferenceValueFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/contribution/directeobjectreference/DirectEObjectReferenceValueFilter.java
@@ -13,8 +13,8 @@ package org.eclipse.sirius.editor.properties.filters.contribution.directeobjectr
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.description.contribution.ContributionPackage;
 import org.eclipse.sirius.editor.properties.filters.common.ContributionPropertyFilter;
-import org.eclipse.sirius.viewpoint.description.contribution.ContributionPackage;
 
 // End of user code specific imports
 
@@ -34,7 +34,7 @@ public class DirectEObjectReferenceValueFilter extends ContributionPropertyFilte
      * {@inheritDoc}
      */
     protected boolean isRightInputType(Object arg0) {
-        return arg0 instanceof org.eclipse.sirius.viewpoint.description.contribution.DirectEObjectReference;
+        return arg0 instanceof org.eclipse.sirius.description.contribution.DirectEObjectReference;
     }
 
     // Start of user code user methods
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/contribution/featurecontribution/FeatureContributionSourceFeatureFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/contribution/featurecontribution/FeatureContributionSourceFeatureFilter.java
index fd934de355..0a88b54331 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/contribution/featurecontribution/FeatureContributionSourceFeatureFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/contribution/featurecontribution/FeatureContributionSourceFeatureFilter.java
@@ -13,8 +13,8 @@ package org.eclipse.sirius.editor.properties.filters.contribution.featurecontrib
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.description.contribution.ContributionPackage;
 import org.eclipse.sirius.editor.properties.filters.common.ContributionPropertyFilter;
-import org.eclipse.sirius.viewpoint.description.contribution.ContributionPackage;
 
 // End of user code specific imports
 
@@ -34,7 +34,7 @@ public class FeatureContributionSourceFeatureFilter extends ContributionProperty
      * {@inheritDoc}
      */
     protected boolean isRightInputType(Object arg0) {
-        return arg0 instanceof org.eclipse.sirius.viewpoint.description.contribution.FeatureContribution;
+        return arg0 instanceof org.eclipse.sirius.description.contribution.FeatureContribution;
     }
 
     // Start of user code user methods
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/contribution/featurecontribution/FeatureContributionTargetFeatureFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/contribution/featurecontribution/FeatureContributionTargetFeatureFilter.java
index f0a9bf4ac4..97a536c874 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/contribution/featurecontribution/FeatureContributionTargetFeatureFilter.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/contribution/featurecontribution/FeatureContributionTargetFeatureFilter.java
@@ -13,8 +13,8 @@ package org.eclipse.sirius.editor.properties.filters.contribution.featurecontrib
 // Start of user code specific imports
 
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.description.contribution.ContributionPackage;
 import org.eclipse.sirius.editor.properties.filters.common.ContributionPropertyFilter;
-import org.eclipse.sirius.viewpoint.description.contribution.ContributionPackage;
 
 // End of user code specific imports
 
@@ -34,7 +34,7 @@ public class FeatureContributionTargetFeatureFilter extends ContributionProperty
      * {@inheritDoc}
      */
     protected boolean isRightInputType(Object arg0) {
-        return arg0 instanceof org.eclipse.sirius.viewpoint.description.contribution.FeatureContribution;
+        return arg0 instanceof org.eclipse.sirius.description.contribution.FeatureContribution;
     }
 
     // Start of user code user methods
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/contribution/computedeobjectreference/ComputedEObjectReferenceValueExpressionPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/contribution/computedeobjectreference/ComputedEObjectReferenceValueExpressionPropertySection.java
index 709f059e46..97a08824a4 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/contribution/computedeobjectreference/ComputedEObjectReferenceValueExpressionPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/contribution/computedeobjectreference/ComputedEObjectReferenceValueExpressionPropertySection.java
@@ -13,9 +13,9 @@ package org.eclipse.sirius.editor.properties.sections.contribution.computedeobje
 // Start of user code imports
 
 import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.sirius.description.contribution.ContributionPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
-import org.eclipse.sirius.viewpoint.description.contribution.ContributionPackage;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/contribution/contribution/ContributionDescriptionPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/contribution/contribution/ContributionDescriptionPropertySection.java
index 997023c2f7..742dcd6d55 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/contribution/contribution/ContributionDescriptionPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/contribution/contribution/ContributionDescriptionPropertySection.java
@@ -13,8 +13,8 @@ package org.eclipse.sirius.editor.properties.sections.contribution.contribution;
 // Start of user code imports
 
 import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.sirius.description.contribution.ContributionPackage;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
-import org.eclipse.sirius.viewpoint.description.contribution.ContributionPackage;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/contribution/contribution/ContributionSubContributionsPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/contribution/contribution/ContributionSubContributionsPropertySection.java
index 60d7bee7f1..07561d6dc6 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/contribution/contribution/ContributionSubContributionsPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/contribution/contribution/ContributionSubContributionsPropertySection.java
@@ -17,8 +17,8 @@ import java.util.List;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
+import org.eclipse.sirius.description.contribution.ContributionPackage;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractEditorDialogPropertySection;
-import org.eclipse.sirius.viewpoint.description.contribution.ContributionPackage;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/contribution/contribution/ContributionTargetPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/contribution/contribution/ContributionTargetPropertySection.java
index 1f6a1ac5a1..7c6bfd6be1 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/contribution/contribution/ContributionTargetPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/contribution/contribution/ContributionTargetPropertySection.java
@@ -20,9 +20,9 @@ import java.util.List;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.sirius.description.contribution.ContributionPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractComboPropertySection;
-import org.eclipse.sirius.viewpoint.description.contribution.ContributionPackage;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/contribution/contributionpoint/ContributionPointContributedPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/contribution/contributionpoint/ContributionPointContributedPropertySection.java
index bf2cd46595..ef28882dfd 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/contribution/contributionpoint/ContributionPointContributedPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/contribution/contributionpoint/ContributionPointContributedPropertySection.java
@@ -20,9 +20,9 @@ import java.util.List;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.sirius.description.contribution.ContributionPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractComboPropertySection;
-import org.eclipse.sirius.viewpoint.description.contribution.ContributionPackage;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/contribution/contributionpoint/ContributionPointOriginPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/contribution/contributionpoint/ContributionPointOriginPropertySection.java
index c2f315a740..6d8ab20c6d 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/contribution/contributionpoint/ContributionPointOriginPropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/contribution/contributionpoint/ContributionPointOriginPropertySection.java
@@ -13,9 +13,9 @@ package org.eclipse.sirius.editor.properties.sections.contribution.contributionp
 // Start of user code imports
 
 import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.sirius.description.contribution.ContributionPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractTextPropertySection;
-import org.eclipse.sirius.viewpoint.description.contribution.ContributionPackage;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
 
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/contribution/directeobjectreference/DirectEObjectReferenceValuePropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/contribution/directeobjectreference/DirectEObjectReferenceValuePropertySection.java
index 71472c8fa6..d80001548b 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/contribution/directeobjectreference/DirectEObjectReferenceValuePropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/contribution/directeobjectreference/DirectEObjectReferenceValuePropertySection.java
@@ -35,12 +35,12 @@ import org.eclipse.sirius.business.internal.movida.Movida;
 import org.eclipse.sirius.common.tools.api.util.AllContents;
 import org.eclipse.sirius.common.tools.api.util.TreeItemWrapper;
 import org.eclipse.sirius.common.ui.tools.api.selection.EObjectSelectionWizard;
+import org.eclipse.sirius.description.contribution.ContributionPackage;
+import org.eclipse.sirius.description.contribution.DirectEObjectReference;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractComboPropertySection;
 import org.eclipse.sirius.ui.tools.api.properties.AbstractMappingImportSelectionWizardBuilder;
 import org.eclipse.sirius.viewpoint.description.Viewpoint;
-import org.eclipse.sirius.viewpoint.description.contribution.ContributionPackage;
-import org.eclipse.sirius.viewpoint.description.contribution.DirectEObjectReference;
 import org.eclipse.sirius.viewpoint.provider.SiriusEditPlugin;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/contribution/featurecontribution/FeatureContributionSourceFeaturePropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/contribution/featurecontribution/FeatureContributionSourceFeaturePropertySection.java
index 226b8ebd86..9c3a80de73 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/contribution/featurecontribution/FeatureContributionSourceFeaturePropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/contribution/featurecontribution/FeatureContributionSourceFeaturePropertySection.java
@@ -22,11 +22,11 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.sirius.description.contribution.Contribution;
+import org.eclipse.sirius.description.contribution.ContributionPackage;
+import org.eclipse.sirius.description.contribution.DirectEObjectReference;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractComboPropertySection;
-import org.eclipse.sirius.viewpoint.description.contribution.Contribution;
-import org.eclipse.sirius.viewpoint.description.contribution.ContributionPackage;
-import org.eclipse.sirius.viewpoint.description.contribution.DirectEObjectReference;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.layout.FormAttachment;
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/contribution/featurecontribution/FeatureContributionTargetFeaturePropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/contribution/featurecontribution/FeatureContributionTargetFeaturePropertySection.java
index 053ef1acf8..d5df1de678 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/contribution/featurecontribution/FeatureContributionTargetFeaturePropertySection.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/contribution/featurecontribution/FeatureContributionTargetFeaturePropertySection.java
@@ -22,11 +22,11 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.sirius.description.contribution.Contribution;
+import org.eclipse.sirius.description.contribution.ContributionPackage;
+import org.eclipse.sirius.description.contribution.DirectEObjectReference;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditor;
 import org.eclipse.sirius.editor.properties.sections.common.AbstractComboPropertySection;
-import org.eclipse.sirius.viewpoint.description.contribution.Contribution;
-import org.eclipse.sirius.viewpoint.description.contribution.ContributionPackage;
-import org.eclipse.sirius.viewpoint.description.contribution.DirectEObjectReference;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.layout.FormAttachment;
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/wizards/ContributionModelWizard.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/wizards/ContributionModelWizard.java
index 0670f2115a..e5160d2a47 100644
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/wizards/ContributionModelWizard.java
+++ b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/wizards/ContributionModelWizard.java
@@ -43,9 +43,9 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.sirius.description.contribution.ContributionFactory;
+import org.eclipse.sirius.description.contribution.ContributionPackage;
 import org.eclipse.sirius.editor.editorPlugin.SiriusEditorPlugin;
-import org.eclipse.sirius.viewpoint.description.contribution.ContributionFactory;
-import org.eclipse.sirius.viewpoint.description.contribution.ContributionPackage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;