[423052] Generate edit code

And fix compilation pb in corresponding plugin (org.eclipse.sirius.ui).
Other generations and compilations problems are split in other commits
to facilitate the review.

Change-Id: I112b7fdecc84a81b0fc7e4136a78f46c4de6c1d1
Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>

29 files changed, 229 insertions, 236 deletions

diff --git a/plugins/org.eclipse.sirius.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.ui/META-INF/MANIFEST.MF
index ddf527846a..0e8d0f71e1 100644
--- a/plugins/org.eclipse.sirius.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.ui/META-INF/MANIFEST.MF
@@ -13,7 +13,6 @@ Export-Package: org.eclipse.sirius.description.contribution.provider;version="1.
  org.eclipse.sirius.diagram.description.provider;version="1.0.0",
  org.eclipse.sirius.diagram.description.style.provider;version="1.0.0",
  org.eclipse.sirius.diagram.description.tool.provider;version="1.0.0",
- org.eclipse.sirius.diagram.description.validation.provider;version="1.0.0",
  org.eclipse.sirius.diagram.provider;version="1.0.0",
  org.eclipse.sirius.ui.business.api.action;version="1.0.0",
  org.eclipse.sirius.ui.business.api.delete;version="1.0.0",
@@ -30,15 +29,15 @@ Export-Package: org.eclipse.sirius.description.contribution.provider;version="1.
  org.eclipse.sirius.ui.business.api.session.factory;version="1.0.0",
  org.eclipse.sirius.ui.business.api.template;version="1.0.0",
  org.eclipse.sirius.ui.business.api.viewpoint;version="1.0.0",
- org.eclipse.sirius.ui.business.internal.commands;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.business.internal.dialect;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.business.internal.dialect.editor;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.business.internal.featureExtensions;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.business.internal.preference;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.business.internal.session;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.business.internal.session.analysis;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.business.internal.session.factory;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.business.internal.template;version="1.0.0";x-internal:=true,
+ org.eclipse.sirius.ui.business.internal.commands;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.business.internal.dialect;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.business.internal.dialect.editor;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.business.internal.featureExtensions;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.business.internal.preference;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.business.internal.session;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.business.internal.session.analysis;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.business.internal.session.factory;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.business.internal.template;x-internal:=true;version="1.0.0",
  org.eclipse.sirius.ui.tools.api;version="1.0.0",
  org.eclipse.sirius.ui.tools.api.actions;version="1.0.0",
  org.eclipse.sirius.ui.tools.api.actions.analysis;version="1.0.0",
@@ -60,44 +59,45 @@ Export-Package: org.eclipse.sirius.description.contribution.provider;version="1.
  org.eclipse.sirius.ui.tools.api.views.modelexplorerview;version="1.0.0",
  org.eclipse.sirius.ui.tools.api.views.modelexplorerview.resourcelistener;version="1.0.0",
  org.eclipse.sirius.ui.tools.api.wizards.page;version="1.0.0",
- org.eclipse.sirius.ui.tools.internal.actions.analysis;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.tools.internal.actions.control;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.tools.internal.actions.copy;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.tools.internal.actions.creation;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.tools.internal.actions.export;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.tools.internal.actions.nature;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.tools.internal.actions.repair;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.tools.internal.actions.session;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.tools.internal.commands;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.tools.internal.dialogs;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.tools.internal.editor;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.tools.internal.operations;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.tools.internal.perspectives;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.tools.internal.preference;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.tools.internal.util;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.tools.internal.views;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.tools.internal.views.common;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.tools.internal.views.common.action;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.tools.internal.views.common.item;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.tools.internal.views.common.modelingproject;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.tools.internal.views.common.modelingproject.manager;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.tools.internal.views.common.modelingproject.model;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.tools.internal.views.common.modelingproject.resourcelistener;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.tools.internal.views.common.navigator;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.tools.internal.views.common.navigator.adapters;x-internal:=true,
- org.eclipse.sirius.ui.tools.internal.views.common.navigator.filter;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.tools.internal.views.common.navigator.sorter;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.tools.internal.views.interpreterview;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.tools.internal.views.modelexplorer;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.tools.internal.views.modelexplorer.extension;x-internal:=true,
- org.eclipse.sirius.ui.tools.internal.views.modelexplorer.extension.tab;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.tools.internal.views.modelexplorer.property;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.tools.internal.wizards;version="1.0.0";x-internal:=true,
- org.eclipse.sirius.ui.tools.internal.wizards.pages;version="1.0.0";x-internal:=true,
+ org.eclipse.sirius.ui.tools.internal.actions.analysis;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.tools.internal.actions.control;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.tools.internal.actions.copy;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.tools.internal.actions.creation;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.tools.internal.actions.export;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.tools.internal.actions.nature;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.tools.internal.actions.repair;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.tools.internal.actions.session;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.tools.internal.commands;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.tools.internal.dialogs;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.tools.internal.editor;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.tools.internal.operations;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.tools.internal.perspectives;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.tools.internal.preference;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.tools.internal.util;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.tools.internal.views;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.tools.internal.views.common;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.tools.internal.views.common.action;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.tools.internal.views.common.item;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.tools.internal.views.common.modelingproject;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.tools.internal.views.common.modelingproject.manager;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.tools.internal.views.common.modelingproject.model;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.tools.internal.views.common.modelingproject.resourcelistener;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.tools.internal.views.common.navigator;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.tools.internal.views.common.navigator.adapters;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.tools.internal.views.common.navigator.filter;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.tools.internal.views.common.navigator.sorter;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.tools.internal.views.interpreterview;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.tools.internal.views.modelexplorer;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.tools.internal.views.modelexplorer.extension;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.tools.internal.views.modelexplorer.extension.tab;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.tools.internal.views.modelexplorer.property;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.tools.internal.wizards;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.ui.tools.internal.wizards.pages;x-internal:=true;version="1.0.0",
  org.eclipse.sirius.viewpoint.description.audit.provider;version="1.0.0",
  org.eclipse.sirius.viewpoint.description.provider;version="1.0.0",
  org.eclipse.sirius.viewpoint.description.style.provider;version="1.0.0",
  org.eclipse.sirius.viewpoint.description.tool.provider;version="1.0.0",
+ org.eclipse.sirius.viewpoint.description.validation.provider;version="1.0.0",
  org.eclipse.sirius.viewpoint.provider;version="1.0.0"
 Require-Bundle: com.google.guava;bundle-version="[11.0.0,12.0.0)",
  org.eclipse.core.runtime;bundle-version="3.8.0",
diff --git a/plugins/org.eclipse.sirius.ui/plugin.xml b/plugins/org.eclipse.sirius.ui/plugin.xml
index 5e0d51a1b0..ec05a79b10 100644
--- a/plugins/org.eclipse.sirius.ui/plugin.xml
+++ b/plugins/org.eclipse.sirius.ui/plugin.xml
@@ -154,8 +154,8 @@
    <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
       <!-- @generated viewpoint -->
       <factory
-            uri="http://www.eclipse.org/sirius/description/audit/1.1.0"
-            class="org.eclipse.sirius.viewpoint.description.audit.provider.AuditItemProviderAdapterFactory"
+            uri="http://www.eclipse.org/sirius/description/validation/1.1.0"
+            class="org.eclipse.sirius.viewpoint.description.validation.provider.ValidationItemProviderAdapterFactory"
             supportedTypes=
               "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
                org.eclipse.emf.edit.provider.IStructuredItemContentProvider
@@ -167,8 +167,8 @@
    <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
       <!-- @generated viewpoint -->
       <factory
-            uri="http://www.eclipse.org/sirius/diagram/1.1.0"
-            class="org.eclipse.sirius.diagram.provider.DiagramItemProviderAdapterFactory"
+            uri="http://www.eclipse.org/sirius/description/audit/1.1.0"
+            class="org.eclipse.sirius.viewpoint.description.audit.provider.AuditItemProviderAdapterFactory"
             supportedTypes=
               "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
                org.eclipse.emf.edit.provider.IStructuredItemContentProvider
@@ -180,8 +180,8 @@
    <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
       <!-- @generated viewpoint -->
       <factory
-            uri="http://www.eclipse.org/sirius/diagram/description/1.1.0"
-            class="org.eclipse.sirius.diagram.description.provider.DescriptionItemProviderAdapterFactory"
+            uri="http://www.eclipse.org/sirius/diagram/1.1.0"
+            class="org.eclipse.sirius.diagram.provider.DiagramItemProviderAdapterFactory"
             supportedTypes=
               "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
                org.eclipse.emf.edit.provider.IStructuredItemContentProvider
@@ -193,8 +193,8 @@
    <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
       <!-- @generated viewpoint -->
       <factory
-            uri="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0"
-            class="org.eclipse.sirius.diagram.description.filter.provider.FilterItemProviderAdapterFactory"
+            uri="http://www.eclipse.org/sirius/diagram/description/1.1.0"
+            class="org.eclipse.sirius.diagram.description.provider.DescriptionItemProviderAdapterFactory"
             supportedTypes=
               "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
                org.eclipse.emf.edit.provider.IStructuredItemContentProvider
@@ -206,8 +206,8 @@
    <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
       <!-- @generated viewpoint -->
       <factory
-            uri="http://www.eclipse.org/sirius/diagram/description/validation/1.1.0"
-            class="org.eclipse.sirius.diagram.description.validation.provider.ValidationItemProviderAdapterFactory"
+            uri="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0"
+            class="org.eclipse.sirius.diagram.description.filter.provider.FilterItemProviderAdapterFactory"
             supportedTypes=
               "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
                org.eclipse.emf.edit.provider.IStructuredItemContentProvider
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ContainerMappingItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ContainerMappingItemProvider.java
index 150fa6d0d6..8181003d35 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ContainerMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ContainerMappingItemProvider.java
@@ -29,9 +29,9 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.sirius.business.api.query.IdentifiedElementQuery;
 import org.eclipse.sirius.diagram.description.ContainerMapping;
 import org.eclipse.sirius.diagram.description.DescriptionFactory;
+import org.eclipse.sirius.diagram.description.DescriptionPackage;
 import org.eclipse.sirius.diagram.description.NodeMapping;
 import org.eclipse.sirius.diagram.description.style.StyleFactory;
-import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
 
 /**
  * This is the item provider adapter for a
@@ -95,7 +95,7 @@ public class ContainerMappingItemProvider extends AbstractNodeMappingItemProvide
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
                 getString("_UI_ContainerMapping_allNodeMappings_feature"),
                 getString("_UI_PropertyDescriptor_description", "_UI_ContainerMapping_allNodeMappings_feature", "_UI_ContainerMapping_type"),
-                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.CONTAINER_MAPPING__ALL_NODE_MAPPINGS, false, false, false, null, getString("_UI_ImportPropertyCategory"), null));
+                DescriptionPackage.Literals.CONTAINER_MAPPING__ALL_NODE_MAPPINGS, false, false, false, null, getString("_UI_ImportPropertyCategory"), null));
     }
 
     /**
@@ -107,7 +107,7 @@ public class ContainerMappingItemProvider extends AbstractNodeMappingItemProvide
     protected void addReusedNodeMappingsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
                 getString("_UI_ContainerMapping_reusedNodeMappings_feature"), getString("_UI_ContainerMapping_reusedNodeMappings_description"),
-                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.CONTAINER_MAPPING__REUSED_NODE_MAPPINGS, true, false, true, null, getString("_UI_ImportPropertyCategory"), null));
+                DescriptionPackage.Literals.CONTAINER_MAPPING__REUSED_NODE_MAPPINGS, true, false, true, null, getString("_UI_ImportPropertyCategory"), null));
     }
 
     /**
@@ -117,11 +117,9 @@ public class ContainerMappingItemProvider extends AbstractNodeMappingItemProvide
      * @generated
      */
     protected void addReusedContainerMappingsPropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-                .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                        getString("_UI_ContainerMapping_reusedContainerMappings_feature"), getString("_UI_ContainerMapping_reusedContainerMappings_description"),
-                        org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.CONTAINER_MAPPING__REUSED_CONTAINER_MAPPINGS, true, false, true, null,
-                        getString("_UI_ImportPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_ContainerMapping_reusedContainerMappings_feature"), getString("_UI_ContainerMapping_reusedContainerMappings_description"),
+                DescriptionPackage.Literals.CONTAINER_MAPPING__REUSED_CONTAINER_MAPPINGS, true, false, true, null, getString("_UI_ImportPropertyCategory"), null));
     }
 
     /**
@@ -131,12 +129,10 @@ public class ContainerMappingItemProvider extends AbstractNodeMappingItemProvide
      * @generated
      */
     protected void addAllContainerMappingsPropertyDescriptor(Object object) {
-        itemPropertyDescriptors
-                .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                        getString("_UI_ContainerMapping_allContainerMappings_feature"),
-                        getString("_UI_PropertyDescriptor_description", "_UI_ContainerMapping_allContainerMappings_feature", "_UI_ContainerMapping_type"),
-                        org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.CONTAINER_MAPPING__ALL_CONTAINER_MAPPINGS, false, false, false, null,
-                        getString("_UI_ImportPropertyCategory"), null));
+        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+                getString("_UI_ContainerMapping_allContainerMappings_feature"),
+                getString("_UI_PropertyDescriptor_description", "_UI_ContainerMapping_allContainerMappings_feature", "_UI_ContainerMapping_type"),
+                DescriptionPackage.Literals.CONTAINER_MAPPING__ALL_CONTAINER_MAPPINGS, false, false, false, null, getString("_UI_ImportPropertyCategory"), null));
     }
 
     /**
@@ -148,8 +144,7 @@ public class ContainerMappingItemProvider extends AbstractNodeMappingItemProvide
     protected void addChildrenPresentationPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
                 getString("_UI_ContainerMapping_childrenPresentation_feature"), getString("_UI_ContainerMapping_childrenPresentation_description"),
-                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.CONTAINER_MAPPING__CHILDREN_PRESENTATION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-                getString("_UI_GeneralPropertyCategory"), null));
+                DescriptionPackage.Literals.CONTAINER_MAPPING__CHILDREN_PRESENTATION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, getString("_UI_GeneralPropertyCategory"), null));
     }
 
     /**
@@ -166,10 +161,10 @@ public class ContainerMappingItemProvider extends AbstractNodeMappingItemProvide
     public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
         if (childrenFeatures == null) {
             super.getChildrenFeatures(object);
-            childrenFeatures.add(org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.CONTAINER_MAPPING__SUB_NODE_MAPPINGS);
-            childrenFeatures.add(org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.CONTAINER_MAPPING__SUB_CONTAINER_MAPPINGS);
-            childrenFeatures.add(org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.CONTAINER_MAPPING__STYLE);
-            childrenFeatures.add(org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.CONTAINER_MAPPING__CONDITIONNAL_STYLES);
+            childrenFeatures.add(DescriptionPackage.Literals.CONTAINER_MAPPING__SUB_NODE_MAPPINGS);
+            childrenFeatures.add(DescriptionPackage.Literals.CONTAINER_MAPPING__SUB_CONTAINER_MAPPINGS);
+            childrenFeatures.add(DescriptionPackage.Literals.CONTAINER_MAPPING__STYLE);
+            childrenFeatures.add(DescriptionPackage.Literals.CONTAINER_MAPPING__CONDITIONNAL_STYLES);
         }
         return childrenFeatures;
     }
@@ -229,13 +224,13 @@ public class ContainerMappingItemProvider extends AbstractNodeMappingItemProvide
         updateChildren(notification);
 
         switch (notification.getFeatureID(ContainerMapping.class)) {
-        case org.eclipse.sirius.diagram.description.DescriptionPackage.CONTAINER_MAPPING__CHILDREN_PRESENTATION:
+        case DescriptionPackage.CONTAINER_MAPPING__CHILDREN_PRESENTATION:
             fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
             return;
-        case org.eclipse.sirius.diagram.description.DescriptionPackage.CONTAINER_MAPPING__SUB_NODE_MAPPINGS:
-        case org.eclipse.sirius.diagram.description.DescriptionPackage.CONTAINER_MAPPING__SUB_CONTAINER_MAPPINGS:
-        case org.eclipse.sirius.diagram.description.DescriptionPackage.CONTAINER_MAPPING__STYLE:
-        case org.eclipse.sirius.diagram.description.DescriptionPackage.CONTAINER_MAPPING__CONDITIONNAL_STYLES:
+        case DescriptionPackage.CONTAINER_MAPPING__SUB_NODE_MAPPINGS:
+        case DescriptionPackage.CONTAINER_MAPPING__SUB_CONTAINER_MAPPINGS:
+        case DescriptionPackage.CONTAINER_MAPPING__STYLE:
+        case DescriptionPackage.CONTAINER_MAPPING__CONDITIONNAL_STYLES:
             fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
             return;
         }
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramDescriptionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramDescriptionItemProvider.java
index 37aaa51acf..52b23b5370 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramDescriptionItemProvider.java
@@ -16,7 +16,6 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
@@ -34,11 +33,9 @@ import org.eclipse.sirius.diagram.description.DiagramDescription;
 import org.eclipse.sirius.diagram.description.EdgeMapping;
 import org.eclipse.sirius.diagram.description.concern.ConcernFactory;
 import org.eclipse.sirius.diagram.description.filter.FilterFactory;
-import org.eclipse.sirius.diagram.description.validation.ValidationFactory;
 import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
-import org.eclipse.sirius.viewpoint.description.provider.DragAndDropTargetDescriptionItemProvider;
 import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
-import org.eclipse.sirius.viewpoint.provider.SiriusEditPlugin;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationFactory;
 
 /**
  * This is the item provider adapter for a
@@ -601,15 +598,4 @@ public class DiagramDescriptionItemProvider extends DragAndDropTargetDescription
                 && ((EObject) obj).eClass().equals(org.eclipse.sirius.diagram.description.DescriptionPackage.eINSTANCE.getEdgeMapping());
     }
 
-    /**
-     * Return the resource locator for this item provider's resources. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public ResourceLocator getResourceLocator() {
-        return SiriusEditPlugin.INSTANCE;
-    }
-
 }
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramExtensionDescriptionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramExtensionDescriptionItemProvider.java
index 6763b27e19..2b13829f5b 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramExtensionDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramExtensionDescriptionItemProvider.java
@@ -31,8 +31,8 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.sirius.diagram.description.DescriptionFactory;
 import org.eclipse.sirius.diagram.description.DiagramExtensionDescription;
 import org.eclipse.sirius.diagram.description.concern.ConcernFactory;
-import org.eclipse.sirius.diagram.description.validation.ValidationFactory;
 import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationFactory;
 import org.eclipse.sirius.viewpoint.provider.SiriusEditPlugin;
 
 /**
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramImportDescriptionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramImportDescriptionItemProvider.java
index 311ad29f3a..e78ee277b9 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramImportDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramImportDescriptionItemProvider.java
@@ -35,9 +35,9 @@ import org.eclipse.sirius.diagram.description.EdgeMapping;
 import org.eclipse.sirius.diagram.description.concern.ConcernFactory;
 import org.eclipse.sirius.diagram.description.filter.FilterFactory;
 import org.eclipse.sirius.diagram.description.tool.ToolFactory;
-import org.eclipse.sirius.diagram.description.validation.ValidationFactory;
 import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
 import org.eclipse.sirius.viewpoint.description.provider.DocumentedElementItemProvider;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationFactory;
 import org.eclipse.sirius.viewpoint.provider.SiriusEditPlugin;
 
 /**
@@ -198,7 +198,8 @@ public class DiagramImportDescriptionItemProvider extends DocumentedElementItemP
     protected void addDropDescriptionsPropertyDescriptor(Object object) {
         itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
                 getString("_UI_DragAndDropTargetDescription_dropDescriptions_feature"), getString("_UI_DragAndDropTargetDescription_dropDescriptions_description"),
-                DescriptionPackage.Literals.DRAG_AND_DROP_TARGET_DESCRIPTION__DROP_DESCRIPTIONS, true, false, true, null, getString("_UI_BehaviorPropertyCategory"), null));
+                org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.DRAG_AND_DROP_TARGET_DESCRIPTION__DROP_DESCRIPTIONS, true, false, true, null,
+                getString("_UI_BehaviorPropertyCategory"), null));
     }
 
     /**
@@ -661,7 +662,7 @@ public class DiagramImportDescriptionItemProvider extends DocumentedElementItemP
         }
         return createChildText;
     }
-    
+
     /**
      * @not-generated
      */
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DragAndDropTargetDescriptionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DragAndDropTargetDescriptionItemProvider.java
index ea4fd279c1..cbf73d9463 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DragAndDropTargetDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DragAndDropTargetDescriptionItemProvider.java
@@ -9,7 +9,7 @@
  *    Obeo - initial API and implementation
  * 
  */
-package org.eclipse.sirius.viewpoint.description.provider;
+package org.eclipse.sirius.diagram.description.provider;
 
 import java.util.Collection;
 import java.util.List;
@@ -25,12 +25,12 @@ 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.ItemProviderAdapter;
-import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
+import org.eclipse.sirius.diagram.description.DescriptionPackage;
 import org.eclipse.sirius.viewpoint.provider.SiriusEditPlugin;
 
 /**
  * This is the item provider adapter for a
- * {@link org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription}
+ * {@link org.eclipse.sirius.diagram.description.DragAndDropTargetDescription}
  * object. <!-- begin-user-doc --> <!-- end-user-doc -->
  * 
  * @generated
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/provider/NodeMappingItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/provider/NodeMappingItemProvider.java
index 33a1091222..3f3c5f0f30 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/provider/NodeMappingItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/provider/NodeMappingItemProvider.java
@@ -30,11 +30,11 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.sirius.business.api.query.IdentifiedElementQuery;
 import org.eclipse.sirius.diagram.ResizeKind;
 import org.eclipse.sirius.diagram.description.DescriptionFactory;
+import org.eclipse.sirius.diagram.description.DescriptionPackage;
 import org.eclipse.sirius.diagram.description.NodeMapping;
 import org.eclipse.sirius.diagram.description.style.NodeStyleDescription;
 import org.eclipse.sirius.diagram.description.style.StyleFactory;
 import org.eclipse.sirius.diagram.description.style.WorkspaceImageDescription;
-import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
 
 /**
  * This is the item provider adapter for a
@@ -97,8 +97,8 @@ public class NodeMappingItemProvider extends AbstractNodeMappingItemProvider imp
     public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
         if (childrenFeatures == null) {
             super.getChildrenFeatures(object);
-            childrenFeatures.add(org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.NODE_MAPPING__STYLE);
-            childrenFeatures.add(org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.NODE_MAPPING__CONDITIONNAL_STYLES);
+            childrenFeatures.add(DescriptionPackage.Literals.NODE_MAPPING__STYLE);
+            childrenFeatures.add(DescriptionPackage.Literals.NODE_MAPPING__CONDITIONNAL_STYLES);
         }
         return childrenFeatures;
     }
@@ -170,8 +170,8 @@ public class NodeMappingItemProvider extends AbstractNodeMappingItemProvider imp
         updateChildren(notification);
 
         switch (notification.getFeatureID(NodeMapping.class)) {
-        case org.eclipse.sirius.diagram.description.DescriptionPackage.NODE_MAPPING__STYLE:
-        case org.eclipse.sirius.diagram.description.DescriptionPackage.NODE_MAPPING__CONDITIONNAL_STYLES:
+        case DescriptionPackage.NODE_MAPPING__STYLE:
+        case DescriptionPackage.NODE_MAPPING__CONDITIONNAL_STYLES:
             fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
             return;
         }
@@ -232,27 +232,25 @@ public class NodeMappingItemProvider extends AbstractNodeMappingItemProvider imp
     protected void collectNewChildDescriptorsGen(Collection<Object> newChildDescriptors, Object object) {
         super.collectNewChildDescriptors(newChildDescriptors, object);
 
-        newChildDescriptors.add(createChildParameter(org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.NODE_MAPPING__STYLE, StyleFactory.eINSTANCE.createCustomStyleDescription()));
+        newChildDescriptors.add(createChildParameter(DescriptionPackage.Literals.NODE_MAPPING__STYLE, StyleFactory.eINSTANCE.createCustomStyleDescription()));
 
-        newChildDescriptors.add(createChildParameter(org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.NODE_MAPPING__STYLE, StyleFactory.eINSTANCE.createSquareDescription()));
+        newChildDescriptors.add(createChildParameter(DescriptionPackage.Literals.NODE_MAPPING__STYLE, StyleFactory.eINSTANCE.createSquareDescription()));
 
-        newChildDescriptors.add(createChildParameter(org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.NODE_MAPPING__STYLE, StyleFactory.eINSTANCE.createLozengeNodeDescription()));
+        newChildDescriptors.add(createChildParameter(DescriptionPackage.Literals.NODE_MAPPING__STYLE, StyleFactory.eINSTANCE.createLozengeNodeDescription()));
 
-        newChildDescriptors.add(createChildParameter(org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.NODE_MAPPING__STYLE, StyleFactory.eINSTANCE.createEllipseNodeDescription()));
+        newChildDescriptors.add(createChildParameter(DescriptionPackage.Literals.NODE_MAPPING__STYLE, StyleFactory.eINSTANCE.createEllipseNodeDescription()));
 
-        newChildDescriptors.add(createChildParameter(org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.NODE_MAPPING__STYLE, StyleFactory.eINSTANCE.createBundledImageDescription()));
+        newChildDescriptors.add(createChildParameter(DescriptionPackage.Literals.NODE_MAPPING__STYLE, StyleFactory.eINSTANCE.createBundledImageDescription()));
 
-        newChildDescriptors.add(createChildParameter(org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.NODE_MAPPING__STYLE, StyleFactory.eINSTANCE.createNoteDescription()));
+        newChildDescriptors.add(createChildParameter(DescriptionPackage.Literals.NODE_MAPPING__STYLE, StyleFactory.eINSTANCE.createNoteDescription()));
 
-        newChildDescriptors.add(createChildParameter(org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.NODE_MAPPING__STYLE, StyleFactory.eINSTANCE.createDotDescription()));
+        newChildDescriptors.add(createChildParameter(DescriptionPackage.Literals.NODE_MAPPING__STYLE, StyleFactory.eINSTANCE.createDotDescription()));
 
-        newChildDescriptors.add(createChildParameter(org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.NODE_MAPPING__STYLE,
-                StyleFactory.eINSTANCE.createGaugeCompositeStyleDescription()));
+        newChildDescriptors.add(createChildParameter(DescriptionPackage.Literals.NODE_MAPPING__STYLE, StyleFactory.eINSTANCE.createGaugeCompositeStyleDescription()));
 
-        newChildDescriptors.add(createChildParameter(org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.NODE_MAPPING__STYLE, StyleFactory.eINSTANCE.createWorkspaceImageDescription()));
+        newChildDescriptors.add(createChildParameter(DescriptionPackage.Literals.NODE_MAPPING__STYLE, StyleFactory.eINSTANCE.createWorkspaceImageDescription()));
 
-        newChildDescriptors.add(createChildParameter(org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.NODE_MAPPING__CONDITIONNAL_STYLES,
-                DescriptionFactory.eINSTANCE.createConditionalNodeStyleDescription()));
+        newChildDescriptors.add(createChildParameter(DescriptionPackage.Literals.NODE_MAPPING__CONDITIONNAL_STYLES, DescriptionFactory.eINSTANCE.createConditionalNodeStyleDescription()));
     }
 
 }
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ContainerDropDescriptionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ContainerDropDescriptionItemProvider.java
index fbb9eed9d7..989e5742b7 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ContainerDropDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ContainerDropDescriptionItemProvider.java
@@ -9,13 +9,14 @@
  *    Obeo - initial API and implementation
  * 
  */
-package org.eclipse.sirius.viewpoint.description.tool.provider;
+package org.eclipse.sirius.diagram.description.tool.provider;
 
 import java.util.Collection;
 import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
@@ -26,13 +27,15 @@ 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.ViewerNotification;
-import org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription;
+import org.eclipse.sirius.diagram.description.tool.ContainerDropDescription;
+import org.eclipse.sirius.diagram.description.tool.ToolPackage;
 import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
-import org.eclipse.sirius.viewpoint.description.tool.ToolPackage;
+import org.eclipse.sirius.viewpoint.description.tool.provider.MappingBasedToolDescriptionItemProvider;
+import org.eclipse.sirius.viewpoint.provider.SiriusEditPlugin;
 
 /**
  * This is the item provider adapter for a
- * {@link org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription}
+ * {@link org.eclipse.sirius.diagram.description.tool.ContainerDropDescription}
  * object. <!-- begin-user-doc --> <!-- end-user-doc -->
  * 
  * @generated
@@ -233,4 +236,15 @@ public class ContainerDropDescriptionItemProvider extends MappingBasedToolDescri
         return super.getCreateChildText(owner, feature, child, selection);
     }
 
+    /**
+     * Return the resource locator for this item provider's resources. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public ResourceLocator getResourceLocator() {
+        return SiriusEditPlugin.INSTANCE;
+    }
+
 }
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ToolGroupExtensionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ToolGroupExtensionItemProvider.java
index 86a385877f..1b33b1f292 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ToolGroupExtensionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ToolGroupExtensionItemProvider.java
@@ -187,10 +187,9 @@ public class ToolGroupExtensionItemProvider extends ItemProviderAdapter implemen
 
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.TOOL_GROUP_EXTENSION__TOOLS, ToolFactory.eINSTANCE.createDiagramNavigationDescription()));
 
-        newChildDescriptors.add(createChildParameter(ToolPackage.Literals.TOOL_GROUP_EXTENSION__TOOLS, org.eclipse.sirius.viewpoint.description.tool.ToolFactory.eINSTANCE.createToolDescription()));
+        newChildDescriptors.add(createChildParameter(ToolPackage.Literals.TOOL_GROUP_EXTENSION__TOOLS, ToolFactory.eINSTANCE.createContainerDropDescription()));
 
-        newChildDescriptors.add(createChildParameter(ToolPackage.Literals.TOOL_GROUP_EXTENSION__TOOLS,
-                org.eclipse.sirius.viewpoint.description.tool.ToolFactory.eINSTANCE.createContainerDropDescription()));
+        newChildDescriptors.add(createChildParameter(ToolPackage.Literals.TOOL_GROUP_EXTENSION__TOOLS, org.eclipse.sirius.viewpoint.description.tool.ToolFactory.eINSTANCE.createToolDescription()));
 
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.TOOL_GROUP_EXTENSION__TOOLS, org.eclipse.sirius.viewpoint.description.tool.ToolFactory.eINSTANCE.createPasteDescription()));
 
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ToolGroupItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ToolGroupItemProvider.java
index 66bacdefe9..5398300cd6 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ToolGroupItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ToolGroupItemProvider.java
@@ -246,9 +246,9 @@ public class ToolGroupItemProvider extends DocumentedElementItemProvider impleme
 
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.TOOL_GROUP__TOOLS, ToolFactory.eINSTANCE.createDiagramNavigationDescription()));
 
-        newChildDescriptors.add(createChildParameter(ToolPackage.Literals.TOOL_GROUP__TOOLS, org.eclipse.sirius.viewpoint.description.tool.ToolFactory.eINSTANCE.createToolDescription()));
+        newChildDescriptors.add(createChildParameter(ToolPackage.Literals.TOOL_GROUP__TOOLS, ToolFactory.eINSTANCE.createContainerDropDescription()));
 
-        newChildDescriptors.add(createChildParameter(ToolPackage.Literals.TOOL_GROUP__TOOLS, org.eclipse.sirius.viewpoint.description.tool.ToolFactory.eINSTANCE.createContainerDropDescription()));
+        newChildDescriptors.add(createChildParameter(ToolPackage.Literals.TOOL_GROUP__TOOLS, org.eclipse.sirius.viewpoint.description.tool.ToolFactory.eINSTANCE.createToolDescription()));
 
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.TOOL_GROUP__TOOLS, org.eclipse.sirius.viewpoint.description.tool.ToolFactory.eINSTANCE.createPasteDescription()));
 
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ToolItemProviderAdapterFactory.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ToolItemProviderAdapterFactory.java
index 1a4e1caeea..d5de17f84a 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ToolItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ToolItemProviderAdapterFactory.java
@@ -707,6 +707,31 @@ public class ToolItemProviderAdapterFactory extends ToolAdapterFactory implement
     }
 
     /**
+     * This keeps track of the one adapter used for all
+     * {@link org.eclipse.sirius.diagram.description.tool.ContainerDropDescription}
+     * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    protected ContainerDropDescriptionItemProvider containerDropDescriptionItemProvider;
+
+    /**
+     * This creates an adapter for a
+     * {@link org.eclipse.sirius.diagram.description.tool.ContainerDropDescription}
+     * . <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public Adapter createContainerDropDescriptionAdapter() {
+        if (containerDropDescriptionItemProvider == null) {
+            containerDropDescriptionItemProvider = new ContainerDropDescriptionItemProvider(this);
+        }
+
+        return containerDropDescriptionItemProvider;
+    }
+
+    /**
      * This returns the root adapter factory that contains this factory. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      * 
@@ -854,6 +879,8 @@ public class ToolItemProviderAdapterFactory extends ToolAdapterFactory implement
             diagramCreationDescriptionItemProvider.dispose();
         if (diagramNavigationDescriptionItemProvider != null)
             diagramNavigationDescriptionItemProvider.dispose();
+        if (containerDropDescriptionItemProvider != null)
+            containerDropDescriptionItemProvider.dispose();
     }
 
 }
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ToolSectionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ToolSectionItemProvider.java
index fdf26dfb27..b6be9f2366 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ToolSectionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ToolSectionItemProvider.java
@@ -303,10 +303,9 @@ public class ToolSectionItemProvider extends DocumentedElementItemProvider imple
 
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.TOOL_SECTION__OWNED_TOOLS, ToolFactory.eINSTANCE.createDiagramNavigationDescription()));
 
-        newChildDescriptors.add(createChildParameter(ToolPackage.Literals.TOOL_SECTION__OWNED_TOOLS, org.eclipse.sirius.viewpoint.description.tool.ToolFactory.eINSTANCE.createToolDescription()));
+        newChildDescriptors.add(createChildParameter(ToolPackage.Literals.TOOL_SECTION__OWNED_TOOLS, ToolFactory.eINSTANCE.createContainerDropDescription()));
 
-        newChildDescriptors.add(createChildParameter(ToolPackage.Literals.TOOL_SECTION__OWNED_TOOLS,
-                org.eclipse.sirius.viewpoint.description.tool.ToolFactory.eINSTANCE.createContainerDropDescription()));
+        newChildDescriptors.add(createChildParameter(ToolPackage.Literals.TOOL_SECTION__OWNED_TOOLS, org.eclipse.sirius.viewpoint.description.tool.ToolFactory.eINSTANCE.createToolDescription()));
 
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.TOOL_SECTION__OWNED_TOOLS, org.eclipse.sirius.viewpoint.description.tool.ToolFactory.eINSTANCE.createPasteDescription()));
 
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/provider/DiagramItemProviderAdapterFactory.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/provider/DiagramItemProviderAdapterFactory.java
index c5c4cab009..d283a81360 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/provider/DiagramItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/provider/DiagramItemProviderAdapterFactory.java
@@ -1095,6 +1095,31 @@ public class DiagramItemProviderAdapterFactory extends DiagramAdapterFactory imp
     }
 
     /**
+     * This keeps track of the one adapter used for all
+     * {@link org.eclipse.sirius.diagram.DragAndDropTarget} instances. <!--
+     * begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    protected DragAndDropTargetItemProvider dragAndDropTargetItemProvider;
+
+    /**
+     * This creates an adapter for a
+     * {@link org.eclipse.sirius.diagram.DragAndDropTarget}. <!-- begin-user-doc
+     * --> <!-- end-user-doc -->
+     * 
+     * @generated
+     */
+    @Override
+    public Adapter createDragAndDropTargetAdapter() {
+        if (dragAndDropTargetItemProvider == null) {
+            dragAndDropTargetItemProvider = new DragAndDropTargetItemProvider(this);
+        }
+
+        return dragAndDropTargetItemProvider;
+    }
+
+    /**
      * This returns the root adapter factory that contains this factory. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      * 
@@ -1274,6 +1299,8 @@ public class DiagramItemProviderAdapterFactory extends DiagramAdapterFactory imp
             viewVariable2ContainerVariableItemProvider.dispose();
         if (containerVariable2StyleDescriptionItemProvider != null)
             containerVariable2StyleDescriptionItemProvider.dispose();
+        if (dragAndDropTargetItemProvider != null)
+            dragAndDropTargetItemProvider.dispose();
     }
 
 }
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DragAndDropTargetItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/provider/DragAndDropTargetItemProvider.java
index aa0e7583a8..56de5dfa8a 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/DragAndDropTargetItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/provider/DragAndDropTargetItemProvider.java
@@ -9,7 +9,7 @@
  *    Obeo - initial API and implementation
  * 
  */
-package org.eclipse.sirius.viewpoint.provider;
+package org.eclipse.sirius.diagram.provider;
 
 import java.util.Collection;
 import java.util.List;
@@ -24,10 +24,11 @@ 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.ItemProviderAdapter;
+import org.eclipse.sirius.viewpoint.provider.SiriusEditPlugin;
 
 /**
  * This is the item provider adapter for a
- * {@link org.eclipse.sirius.viewpoint.DragAndDropTarget} object. <!--
+ * {@link org.eclipse.sirius.diagram.DragAndDropTarget} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
  * 
  * @generated
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/EnvironmentItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/EnvironmentItemProvider.java
index 342e057fc7..2902c988a3 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/EnvironmentItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/EnvironmentItemProvider.java
@@ -161,8 +161,6 @@ public class EnvironmentItemProvider extends ItemProviderAdapter implements IEdi
 
         newChildDescriptors.add(createChildParameter(DescriptionPackage.Literals.ENVIRONMENT__DEFAULT_TOOLS, ToolFactory.eINSTANCE.createToolDescription()));
 
-        newChildDescriptors.add(createChildParameter(DescriptionPackage.Literals.ENVIRONMENT__DEFAULT_TOOLS, ToolFactory.eINSTANCE.createContainerDropDescription()));
-
         newChildDescriptors.add(createChildParameter(DescriptionPackage.Literals.ENVIRONMENT__DEFAULT_TOOLS, ToolFactory.eINSTANCE.createPasteDescription()));
 
         newChildDescriptors.add(createChildParameter(DescriptionPackage.Literals.ENVIRONMENT__DEFAULT_TOOLS, ToolFactory.eINSTANCE.createSelectionWizardDescription()));
@@ -211,6 +209,9 @@ public class EnvironmentItemProvider extends ItemProviderAdapter implements IEdi
         newChildDescriptors.add(createChildParameter(DescriptionPackage.Literals.ENVIRONMENT__DEFAULT_TOOLS,
                 org.eclipse.sirius.diagram.description.tool.ToolFactory.eINSTANCE.createDiagramNavigationDescription()));
 
+        newChildDescriptors.add(createChildParameter(DescriptionPackage.Literals.ENVIRONMENT__DEFAULT_TOOLS,
+                org.eclipse.sirius.diagram.description.tool.ToolFactory.eINSTANCE.createContainerDropDescription()));
+
         newChildDescriptors.add(createChildParameter(DescriptionPackage.Literals.ENVIRONMENT__LABEL_BORDER_STYLES, StyleFactory.eINSTANCE.createLabelBorderStyles()));
     }
 
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/ViewpointItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/ViewpointItemProvider.java
index 51e4a3f148..011ab0668e 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/ViewpointItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/ViewpointItemProvider.java
@@ -29,7 +29,6 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 import org.eclipse.sirius.business.api.query.IdentifiedElementQuery;
-import org.eclipse.sirius.diagram.description.validation.ValidationFactory;
 import org.eclipse.sirius.ext.base.Option;
 import org.eclipse.sirius.ui.business.api.dialect.DialectUIManager;
 import org.eclipse.sirius.ui.business.api.featureExtensions.FeatureExtensionsUIManager;
@@ -38,6 +37,7 @@ import org.eclipse.sirius.ui.tools.internal.util.EMFCoreUtil;
 import org.eclipse.sirius.viewpoint.description.DescriptionFactory;
 import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
 import org.eclipse.sirius.viewpoint.description.Viewpoint;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationFactory;
 
 /**
  * This is the item provider adapter for a
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ContainerModelOperationItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ContainerModelOperationItemProvider.java
index b9dbeff50e..a4706f2dfd 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ContainerModelOperationItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ContainerModelOperationItemProvider.java
@@ -226,6 +226,5 @@ public class ContainerModelOperationItemProvider extends ModelOperationItemProvi
 
         newChildDescriptors.add(createChildParameter(ToolPackage.Literals.CONTAINER_MODEL_OPERATION__SUB_MODEL_OPERATIONS,
                 org.eclipse.sirius.diagram.description.tool.ToolFactory.eINSTANCE.createNavigation()));
-
     }
 }
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ToolItemProviderAdapterFactory.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ToolItemProviderAdapterFactory.java
index 42829cbe28..cabfcc6bc7 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ToolItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/tool/provider/ToolItemProviderAdapterFactory.java
@@ -108,31 +108,6 @@ public class ToolItemProviderAdapterFactory extends ToolAdapterFactory implement
 
     /**
      * This keeps track of the one adapter used for all
-     * {@link org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription}
-     * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected ContainerDropDescriptionItemProvider containerDropDescriptionItemProvider;
-
-    /**
-     * This creates an adapter for a
-     * {@link org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription}
-     * . <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Adapter createContainerDropDescriptionAdapter() {
-        if (containerDropDescriptionItemProvider == null) {
-            containerDropDescriptionItemProvider = new ContainerDropDescriptionItemProvider(this);
-        }
-
-        return containerDropDescriptionItemProvider;
-    }
-
-    /**
-     * This keeps track of the one adapter used for all
      * {@link org.eclipse.sirius.viewpoint.description.tool.PasteDescription}
      * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
@@ -1231,8 +1206,6 @@ public class ToolItemProviderAdapterFactory extends ToolAdapterFactory implement
     public void dispose() {
         if (toolDescriptionItemProvider != null)
             toolDescriptionItemProvider.dispose();
-        if (containerDropDescriptionItemProvider != null)
-            containerDropDescriptionItemProvider.dispose();
         if (pasteDescriptionItemProvider != null)
             pasteDescriptionItemProvider.dispose();
         if (selectionWizardDescriptionItemProvider != null)
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/validation/provider/RuleAuditItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/RuleAuditItemProvider.java
index 04f456cafa..c39b8a19d5 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/validation/provider/RuleAuditItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/RuleAuditItemProvider.java
@@ -9,7 +9,7 @@
  *    Obeo - initial API and implementation
  * 
  */
-package org.eclipse.sirius.diagram.description.validation.provider;
+package org.eclipse.sirius.viewpoint.description.validation.provider;
 
 import java.util.Collection;
 import java.util.List;
@@ -27,13 +27,13 @@ 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.diagram.description.validation.RuleAudit;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
+import org.eclipse.sirius.viewpoint.description.validation.RuleAudit;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
 import org.eclipse.sirius.viewpoint.provider.SiriusEditPlugin;
 
 /**
  * This is the item provider adapter for a
- * {@link org.eclipse.sirius.diagram.description.validation.RuleAudit} object.
+ * {@link org.eclipse.sirius.viewpoint.description.validation.RuleAudit} object.
  * <!-- begin-user-doc --> <!-- end-user-doc -->
  * 
  * @generated
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/validation/provider/SemanticValidationRuleItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/SemanticValidationRuleItemProvider.java
index ec89f72270..c88afe22f3 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/validation/provider/SemanticValidationRuleItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/SemanticValidationRuleItemProvider.java
@@ -9,7 +9,7 @@
  *    Obeo - initial API and implementation
  * 
  */
-package org.eclipse.sirius.diagram.description.validation.provider;
+package org.eclipse.sirius.viewpoint.description.validation.provider;
 
 import java.util.Collection;
 import java.util.List;
@@ -25,13 +25,13 @@ 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.ViewerNotification;
-import org.eclipse.sirius.diagram.description.validation.ERROR_LEVEL;
-import org.eclipse.sirius.diagram.description.validation.SemanticValidationRule;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
+import org.eclipse.sirius.viewpoint.description.validation.ERROR_LEVEL;
+import org.eclipse.sirius.viewpoint.description.validation.SemanticValidationRule;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
 
 /**
  * This is the item provider adapter for a
- * {@link org.eclipse.sirius.diagram.description.validation.SemanticValidationRule}
+ * {@link org.eclipse.sirius.viewpoint.description.validation.SemanticValidationRule}
  * object. <!-- begin-user-doc --> <!-- end-user-doc -->
  * 
  * @generated
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/validation/provider/ValidationFixItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/ValidationFixItemProvider.java
index 52f0de6c31..fa4768218c 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/validation/provider/ValidationFixItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/ValidationFixItemProvider.java
@@ -9,7 +9,7 @@
  *    Obeo - initial API and implementation
  * 
  */
-package org.eclipse.sirius.diagram.description.validation.provider;
+package org.eclipse.sirius.viewpoint.description.validation.provider;
 
 import java.util.Collection;
 import java.util.List;
@@ -28,14 +28,14 @@ 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.diagram.description.validation.ValidationFix;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
 import org.eclipse.sirius.viewpoint.description.tool.ToolFactory;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationFix;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
 import org.eclipse.sirius.viewpoint.provider.SiriusEditPlugin;
 
 /**
  * This is the item provider adapter for a
- * {@link org.eclipse.sirius.diagram.description.validation.ValidationFix}
+ * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationFix}
  * object. <!-- begin-user-doc --> <!-- end-user-doc -->
  * 
  * @generated
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/validation/provider/ValidationItemProviderAdapterFactory.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/ValidationItemProviderAdapterFactory.java
index e04dae3ccd..5897114718 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/validation/provider/ValidationItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/ValidationItemProviderAdapterFactory.java
@@ -9,7 +9,7 @@
  *    Obeo - initial API and implementation
  * 
  */
-package org.eclipse.sirius.diagram.description.validation.provider;
+package org.eclipse.sirius.viewpoint.description.validation.provider;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -28,7 +28,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.INotifyChangedListener;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.sirius.diagram.description.validation.util.ValidationAdapterFactory;
+import org.eclipse.sirius.viewpoint.description.validation.util.ValidationAdapterFactory;
 
 /**
  * This is the factory that is used to provide the interfaces needed to support
@@ -83,7 +83,7 @@ public class ValidationItemProviderAdapterFactory extends ValidationAdapterFacto
 
     /**
      * This keeps track of the one adapter used for all
-     * {@link org.eclipse.sirius.diagram.description.validation.ValidationSet}
+     * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationSet}
      * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
@@ -92,8 +92,8 @@ public class ValidationItemProviderAdapterFactory extends ValidationAdapterFacto
 
     /**
      * This creates an adapter for a
-     * {@link org.eclipse.sirius.diagram.description.validation.ValidationSet}.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationSet}
+     * . <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
@@ -108,7 +108,7 @@ public class ValidationItemProviderAdapterFactory extends ValidationAdapterFacto
 
     /**
      * This keeps track of the one adapter used for all
-     * {@link org.eclipse.sirius.diagram.description.validation.SemanticValidationRule}
+     * {@link org.eclipse.sirius.viewpoint.description.validation.SemanticValidationRule}
      * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
@@ -117,7 +117,7 @@ public class ValidationItemProviderAdapterFactory extends ValidationAdapterFacto
 
     /**
      * This creates an adapter for a
-     * {@link org.eclipse.sirius.diagram.description.validation.SemanticValidationRule}
+     * {@link org.eclipse.sirius.viewpoint.description.validation.SemanticValidationRule}
      * . <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
@@ -133,7 +133,7 @@ public class ValidationItemProviderAdapterFactory extends ValidationAdapterFacto
 
     /**
      * This keeps track of the one adapter used for all
-     * {@link org.eclipse.sirius.diagram.description.validation.ViewValidationRule}
+     * {@link org.eclipse.sirius.viewpoint.description.validation.ViewValidationRule}
      * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
@@ -142,7 +142,7 @@ public class ValidationItemProviderAdapterFactory extends ValidationAdapterFacto
 
     /**
      * This creates an adapter for a
-     * {@link org.eclipse.sirius.diagram.description.validation.ViewValidationRule}
+     * {@link org.eclipse.sirius.viewpoint.description.validation.ViewValidationRule}
      * . <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
@@ -158,7 +158,7 @@ public class ValidationItemProviderAdapterFactory extends ValidationAdapterFacto
 
     /**
      * This keeps track of the one adapter used for all
-     * {@link org.eclipse.sirius.diagram.description.validation.RuleAudit}
+     * {@link org.eclipse.sirius.viewpoint.description.validation.RuleAudit}
      * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
@@ -167,8 +167,8 @@ public class ValidationItemProviderAdapterFactory extends ValidationAdapterFacto
 
     /**
      * This creates an adapter for a
-     * {@link org.eclipse.sirius.diagram.description.validation.RuleAudit}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
+     * {@link org.eclipse.sirius.viewpoint.description.validation.RuleAudit}.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
@@ -183,7 +183,7 @@ public class ValidationItemProviderAdapterFactory extends ValidationAdapterFacto
 
     /**
      * This keeps track of the one adapter used for all
-     * {@link org.eclipse.sirius.diagram.description.validation.ValidationFix}
+     * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationFix}
      * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
@@ -192,8 +192,8 @@ public class ValidationItemProviderAdapterFactory extends ValidationAdapterFacto
 
     /**
      * This creates an adapter for a
-     * {@link org.eclipse.sirius.diagram.description.validation.ValidationFix}.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationFix}
+     * . <!-- begin-user-doc --> <!-- end-user-doc -->
      * 
      * @generated
      */
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/validation/provider/ValidationRuleItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/ValidationRuleItemProvider.java
index c803d09a1e..a651acc23c 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/validation/provider/ValidationRuleItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/ValidationRuleItemProvider.java
@@ -9,7 +9,7 @@
  *    Obeo - initial API and implementation
  * 
  */
-package org.eclipse.sirius.diagram.description.validation.provider;
+package org.eclipse.sirius.viewpoint.description.validation.provider;
 
 import java.util.Collection;
 import java.util.List;
@@ -28,15 +28,15 @@ 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.diagram.description.validation.ERROR_LEVEL;
-import org.eclipse.sirius.diagram.description.validation.ValidationFactory;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
-import org.eclipse.sirius.diagram.description.validation.ValidationRule;
+import org.eclipse.sirius.viewpoint.description.validation.ERROR_LEVEL;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationFactory;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationRule;
 import org.eclipse.sirius.viewpoint.provider.SiriusEditPlugin;
 
 /**
  * This is the item provider adapter for a
- * {@link org.eclipse.sirius.diagram.description.validation.ValidationRule}
+ * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationRule}
  * object. <!-- begin-user-doc --> <!-- end-user-doc -->
  * 
  * @generated
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/validation/provider/ValidationSetItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/ValidationSetItemProvider.java
index 3256075392..89d2ee79ca 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/validation/provider/ValidationSetItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/ValidationSetItemProvider.java
@@ -9,7 +9,7 @@
  *    Obeo - initial API and implementation
  * 
  */
-package org.eclipse.sirius.diagram.description.validation.provider;
+package org.eclipse.sirius.viewpoint.description.validation.provider;
 
 import java.util.Collection;
 import java.util.List;
@@ -27,15 +27,15 @@ 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.ViewerNotification;
-import org.eclipse.sirius.diagram.description.validation.ValidationFactory;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
-import org.eclipse.sirius.diagram.description.validation.ValidationSet;
 import org.eclipse.sirius.viewpoint.description.provider.DocumentedElementItemProvider;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationFactory;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationSet;
 import org.eclipse.sirius.viewpoint.provider.SiriusEditPlugin;
 
 /**
  * This is the item provider adapter for a
- * {@link org.eclipse.sirius.diagram.description.validation.ValidationSet}
+ * {@link org.eclipse.sirius.viewpoint.description.validation.ValidationSet}
  * object. <!-- begin-user-doc --> <!-- end-user-doc -->
  * 
  * @generated
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/validation/provider/ViewValidationRuleItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/ViewValidationRuleItemProvider.java
index e832b34a91..d42337f999 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/diagram/description/validation/provider/ViewValidationRuleItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/validation/provider/ViewValidationRuleItemProvider.java
@@ -9,7 +9,7 @@
  *    Obeo - initial API and implementation
  * 
  */
-package org.eclipse.sirius.diagram.description.validation.provider;
+package org.eclipse.sirius.viewpoint.description.validation.provider;
 
 import java.util.Collection;
 import java.util.List;
@@ -23,13 +23,13 @@ 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.sirius.diagram.description.validation.ERROR_LEVEL;
-import org.eclipse.sirius.diagram.description.validation.ValidationPackage;
-import org.eclipse.sirius.diagram.description.validation.ViewValidationRule;
+import org.eclipse.sirius.viewpoint.description.validation.ERROR_LEVEL;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationPackage;
+import org.eclipse.sirius.viewpoint.description.validation.ViewValidationRule;
 
 /**
  * This is the item provider adapter for a
- * {@link org.eclipse.sirius.diagram.description.validation.ViewValidationRule}
+ * {@link org.eclipse.sirius.viewpoint.description.validation.ViewValidationRule}
  * object. <!-- begin-user-doc --> <!-- end-user-doc -->
  * 
  * @generated
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/SiriusEditPlugin.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/SiriusEditPlugin.java
index 031b21e27e..066497b46b 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/SiriusEditPlugin.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/SiriusEditPlugin.java
@@ -47,7 +47,6 @@ import org.eclipse.sirius.business.api.preferences.SiriusPreferencesKeys;
 import org.eclipse.sirius.common.tools.api.util.EclipseUtil;
 import org.eclipse.sirius.diagram.description.concern.provider.ConcernItemProviderAdapterFactory;
 import org.eclipse.sirius.diagram.description.filter.provider.FilterItemProviderAdapterFactory;
-import org.eclipse.sirius.diagram.description.validation.provider.ValidationItemProviderAdapterFactory;
 import org.eclipse.sirius.tools.api.command.ui.UICallBack;
 import org.eclipse.sirius.tools.api.preferences.DCorePreferences;
 import org.eclipse.sirius.ui.business.api.preferences.DesignerUIPreferencesKeys;
@@ -65,6 +64,7 @@ import org.eclipse.sirius.viewpoint.description.audit.provider.AuditItemProvider
 import org.eclipse.sirius.viewpoint.description.provider.DescriptionItemProviderAdapterFactory;
 import org.eclipse.sirius.viewpoint.description.style.provider.StyleItemProviderAdapterFactory;
 import org.eclipse.sirius.viewpoint.description.tool.provider.ToolItemProviderAdapterFactory;
+import org.eclipse.sirius.viewpoint.description.validation.provider.ValidationItemProviderAdapterFactory;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/ViewpointItemProviderAdapterFactory.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/ViewpointItemProviderAdapterFactory.java
index 09376d9b34..43e7f6fb9b 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/ViewpointItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/ViewpointItemProviderAdapterFactory.java
@@ -307,31 +307,6 @@ public class ViewpointItemProviderAdapterFactory extends ViewpointAdapterFactory
 
     /**
      * This keeps track of the one adapter used for all
-     * {@link org.eclipse.sirius.viewpoint.DragAndDropTarget} instances. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    protected DragAndDropTargetItemProvider dragAndDropTargetItemProvider;
-
-    /**
-     * This creates an adapter for a
-     * {@link org.eclipse.sirius.viewpoint.DragAndDropTarget}. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    @Override
-    public Adapter createDragAndDropTargetAdapter() {
-        if (dragAndDropTargetItemProvider == null) {
-            dragAndDropTargetItemProvider = new DragAndDropTargetItemProvider(this);
-        }
-
-        return dragAndDropTargetItemProvider;
-    }
-
-    /**
-     * This keeps track of the one adapter used for all
      * {@link org.eclipse.sirius.viewpoint.RGBValues} instances. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      * 
@@ -669,8 +644,6 @@ public class ViewpointItemProviderAdapterFactory extends ViewpointAdapterFactory
             dAnalysisCustomDataItemProvider.dispose();
         if (labelStyleItemProvider != null)
             labelStyleItemProvider.dispose();
-        if (dragAndDropTargetItemProvider != null)
-            dragAndDropTargetItemProvider.dispose();
         if (rgbValuesItemProvider != null)
             rgbValuesItemProvider.dispose();
         if (dAnalysisSessionEObjectItemProvider != null)
diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/SelectExtractedRepresentationsPage.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/SelectExtractedRepresentationsPage.java
index 1b94c01ae0..75c8b6e181 100644
--- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/SelectExtractedRepresentationsPage.java
+++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/SelectExtractedRepresentationsPage.java
@@ -32,11 +32,11 @@ import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.sirius.diagram.DDiagram;
 import org.eclipse.sirius.diagram.description.filter.provider.FilterItemProviderAdapterFactory;
-import org.eclipse.sirius.diagram.description.validation.provider.ValidationItemProviderAdapterFactory;
 import org.eclipse.sirius.viewpoint.DRepresentation;
 import org.eclipse.sirius.viewpoint.description.audit.provider.AuditItemProviderAdapterFactory;
 import org.eclipse.sirius.viewpoint.description.provider.DescriptionItemProviderAdapterFactory;
 import org.eclipse.sirius.viewpoint.description.tool.provider.ToolItemProviderAdapterFactory;
+import org.eclipse.sirius.viewpoint.description.validation.provider.ValidationItemProviderAdapterFactory;
 import org.eclipse.sirius.viewpoint.provider.ViewpointItemProviderAdapterFactory;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;