[423052] Fix compilation problems causes by this move.

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

14 files changed, 19 insertions, 19 deletions

diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/util/DelegatingDiagramCommandFactory.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/util/DelegatingDiagramCommandFactory.java
index 379a23abca..65766d0054 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/util/DelegatingDiagramCommandFactory.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/util/DelegatingDiagramCommandFactory.java
@@ -33,7 +33,6 @@ import org.eclipse.sirius.diagram.description.tool.DoubleClickDescription;
 import org.eclipse.sirius.diagram.description.tool.EdgeCreationDescription;
 import org.eclipse.sirius.diagram.description.tool.NodeCreationDescription;
 import org.eclipse.sirius.diagram.description.tool.ReconnectEdgeDescription;
-import org.eclipse.sirius.diagram.description.validation.ValidationFix;
 import org.eclipse.sirius.tools.api.command.DCommand;
 import org.eclipse.sirius.tools.api.command.IDiagramCommandFactory;
 import org.eclipse.sirius.tools.api.command.ui.UICallBack;
@@ -49,6 +48,7 @@ import org.eclipse.sirius.viewpoint.description.tool.PasteDescription;
 import org.eclipse.sirius.viewpoint.description.tool.RepresentationCreationDescription;
 import org.eclipse.sirius.viewpoint.description.tool.SelectionWizardDescription;
 import org.eclipse.sirius.viewpoint.description.tool.ToolDescription;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationFix;
 
 import com.google.common.base.Preconditions;
 
diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/dialect/DiagramDialectUIServices.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/dialect/DiagramDialectUIServices.java
index bdd5dbdede..bd82b84ed5 100644
--- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/dialect/DiagramDialectUIServices.java
+++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/dialect/DiagramDialectUIServices.java
@@ -78,7 +78,6 @@ import org.eclipse.sirius.diagram.description.provider.DescriptionItemProviderAd
 import org.eclipse.sirius.diagram.description.style.provider.StyleItemProviderAdapterFactory;
 import org.eclipse.sirius.diagram.description.tool.ToolFactory;
 import org.eclipse.sirius.diagram.description.tool.provider.ToolItemProviderAdapterFactory;
-import org.eclipse.sirius.diagram.description.validation.provider.ValidationItemProviderAdapterFactory;
 import org.eclipse.sirius.diagram.edit.api.part.IDDiagramEditPart;
 import org.eclipse.sirius.diagram.part.SiriusDiagramEditorPlugin;
 import org.eclipse.sirius.diagram.provider.DiagramItemProviderAdapterFactory;
@@ -359,7 +358,6 @@ public class DiagramDialectUIServices implements DialectUIServices {
         factory.addAdapterFactory(new StyleItemProviderAdapterFactory());
         factory.addAdapterFactory(new ToolItemProviderAdapterFactory());
         factory.addAdapterFactory(new FilterItemProviderAdapterFactory());
-        factory.addAdapterFactory(new ValidationItemProviderAdapterFactory());
         factory.addAdapterFactory(new ConcernItemProviderAdapterFactory());
         return factory;
     }
diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/graphical/edit/internal/policies/validators/DragAndDropValidator.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/graphical/edit/internal/policies/validators/DragAndDropValidator.java
index 83a9e0a1f2..cebdf9b5b4 100644
--- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/graphical/edit/internal/policies/validators/DragAndDropValidator.java
+++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/graphical/edit/internal/policies/validators/DragAndDropValidator.java
@@ -27,13 +27,13 @@ import org.eclipse.sirius.business.api.session.Session;
 import org.eclipse.sirius.business.api.session.SessionManager;
 import org.eclipse.sirius.business.internal.metamodel.operations.DDiagramElementContainerSpecOperations;
 import org.eclipse.sirius.diagram.DDiagramElement;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.description.DescriptionPackage;
 import org.eclipse.sirius.diagram.description.DiagramElementMapping;
+import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription;
+import org.eclipse.sirius.diagram.description.tool.ContainerDropDescription;
 import org.eclipse.sirius.diagram.ui.tools.internal.dnd.DragAndDropWrapper;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
-import org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription;
-import org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription;
 import org.eclipse.sirius.viewpoint.description.tool.DragSource;
 
 /**
diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/graphical/edit/policies/SiriusContainerDropPolicy.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/graphical/edit/policies/SiriusContainerDropPolicy.java
index 15a7f316a9..b8508ef490 100644
--- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/graphical/edit/policies/SiriusContainerDropPolicy.java
+++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/graphical/edit/policies/SiriusContainerDropPolicy.java
@@ -46,10 +46,13 @@ import org.eclipse.sirius.business.api.session.SessionManager;
 import org.eclipse.sirius.business.internal.metamodel.operations.DDiagramElementContainerSpecOperations;
 import org.eclipse.sirius.diagram.AbstractDNode;
 import org.eclipse.sirius.diagram.DDiagramElement;
+import org.eclipse.sirius.diagram.DragAndDropTarget;
 import org.eclipse.sirius.diagram.business.internal.command.AddLayoutDataToManageCommand;
 import org.eclipse.sirius.diagram.business.internal.query.RequestQuery;
 import org.eclipse.sirius.diagram.business.internal.view.AbstractLayoutData;
 import org.eclipse.sirius.diagram.business.internal.view.RootLayoutData;
+import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription;
+import org.eclipse.sirius.diagram.description.tool.ContainerDropDescription;
 import org.eclipse.sirius.diagram.edit.api.part.AbstractDiagramBorderNodeEditPart;
 import org.eclipse.sirius.diagram.graphical.edit.internal.policies.validators.DragAndDropValidator;
 import org.eclipse.sirius.diagram.internal.edit.parts.AbstractDNodeContainerCompartmentEditPart;
@@ -62,9 +65,6 @@ import org.eclipse.sirius.tools.api.command.IDiagramCommandFactory;
 import org.eclipse.sirius.tools.api.command.IDiagramCommandFactoryProvider;
 import org.eclipse.sirius.tools.api.command.SiriusCommand;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
-import org.eclipse.sirius.viewpoint.DragAndDropTarget;
-import org.eclipse.sirius.viewpoint.description.DragAndDropTargetDescription;
-import org.eclipse.sirius.viewpoint.description.tool.ContainerDropDescription;
 import org.eclipse.sirius.viewpoint.description.tool.DragSource;
 import org.eclipse.swt.graphics.Color;
 
diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/internal/providers/SiriusMarkerNavigationProvider.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/internal/providers/SiriusMarkerNavigationProvider.java
index 047900ca3c..5f4df548d9 100644
--- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/internal/providers/SiriusMarkerNavigationProvider.java
+++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/internal/providers/SiriusMarkerNavigationProvider.java
@@ -23,9 +23,9 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.gef.EditPart;
 import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;
 import org.eclipse.gmf.runtime.emf.ui.providers.marker.AbstractModelMarkerNavigationProvider;
-import org.eclipse.sirius.diagram.description.validation.ValidationRule;
 import org.eclipse.sirius.diagram.part.SiriusDiagramEditorPlugin;
 import org.eclipse.sirius.diagram.part.SiriusDiagramEditorUtil;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationRule;
 
 /**
  * @was-generated
diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/internal/quickfix/DesignerResolutionGenerator.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/internal/quickfix/DesignerResolutionGenerator.java
index 3cfde2e36d..1f732e7ab1 100644
--- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/internal/quickfix/DesignerResolutionGenerator.java
+++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/internal/quickfix/DesignerResolutionGenerator.java
@@ -15,7 +15,7 @@ import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.sirius.diagram.description.validation.ValidationRule;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationRule;
 import org.eclipse.ui.IMarkerResolution;
 import org.eclipse.ui.IMarkerResolutionGenerator;
 
diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/internal/quickfix/ValidationFixResolution.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/internal/quickfix/ValidationFixResolution.java
index ccb1fa1ad2..6ae657f7f1 100644
--- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/internal/quickfix/ValidationFixResolution.java
+++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/internal/quickfix/ValidationFixResolution.java
@@ -23,13 +23,13 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.sirius.business.api.session.Session;
 import org.eclipse.sirius.business.api.session.SessionManager;
 import org.eclipse.sirius.diagram.DDiagram;
-import org.eclipse.sirius.diagram.description.validation.ValidationFix;
-import org.eclipse.sirius.diagram.description.validation.ViewValidationRule;
 import org.eclipse.sirius.tools.api.command.IDiagramCommandFactory;
 import org.eclipse.sirius.tools.api.command.IDiagramCommandFactoryProvider;
 import org.eclipse.sirius.ui.business.api.dialect.DialectEditor;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
 import org.eclipse.sirius.viewpoint.SiriusPlugin;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationFix;
+import org.eclipse.sirius.viewpoint.description.validation.ViewValidationRule;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IMarkerResolution;
 import org.eclipse.ui.PartInitException;
diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/part/SiriusDiagramEditorPlugin.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/part/SiriusDiagramEditorPlugin.java
index 0e099b8439..61ced80ce7 100644
--- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/part/SiriusDiagramEditorPlugin.java
+++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/part/SiriusDiagramEditorPlugin.java
@@ -44,12 +44,12 @@ import org.eclipse.sirius.diagram.business.internal.image.ImageSelectorDescripto
 import org.eclipse.sirius.diagram.business.internal.image.refresh.WorkspaceImageFigureRefresher;
 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.diagram.provider.DiagramItemProviderAdapterFactory;
 import org.eclipse.sirius.diagram.tools.internal.resource.CustomSiriusDocumentProvider;
 import org.eclipse.sirius.diagram.tools.internal.resource.ResourceMissingDocumentProvider;
 import org.eclipse.sirius.diagram.ui.tools.internal.layout.data.extension.LayoutDataManagerRegistryListener;
 import org.eclipse.sirius.viewpoint.description.audit.provider.AuditItemProviderAdapterFactory;
+import org.eclipse.sirius.viewpoint.description.validation.provider.ValidationItemProviderAdapterFactory;
 import org.eclipse.sirius.viewpoint.provider.SiriusEditPlugin;
 import org.eclipse.sirius.viewpoint.provider.ViewpointItemProviderAdapterFactory;
 import org.eclipse.swt.graphics.Image;
diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/marker/SiriusMarkerNavigationProviderSpec.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/marker/SiriusMarkerNavigationProviderSpec.java
index d9deb15436..2cb1e7ed6e 100644
--- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/marker/SiriusMarkerNavigationProviderSpec.java
+++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/marker/SiriusMarkerNavigationProviderSpec.java
@@ -26,7 +26,6 @@ import org.eclipse.sirius.business.api.session.Session;
 import org.eclipse.sirius.business.api.session.SessionManager;
 import org.eclipse.sirius.diagram.DDiagram;
 import org.eclipse.sirius.diagram.DSemanticDiagram;
-import org.eclipse.sirius.diagram.description.validation.ValidationRule;
 import org.eclipse.sirius.diagram.internal.providers.SiriusMarkerNavigationProvider;
 import org.eclipse.sirius.diagram.part.SiriusDiagramEditor;
 import org.eclipse.sirius.diagram.part.SiriusDiagramEditorPlugin;
@@ -36,6 +35,7 @@ import org.eclipse.sirius.diagram.tools.internal.resource.NavigationMarkerConsta
 import org.eclipse.sirius.ui.business.api.dialect.DialectEditor;
 import org.eclipse.sirius.ui.business.api.dialect.DialectUIManager;
 import org.eclipse.sirius.ui.tools.internal.views.common.modelingproject.OpenRepresentationsFileJob;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationRule;
 import org.eclipse.ui.IEditorReference;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/ui/tools/internal/commands/ActivateRulesCommand.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/ui/tools/internal/commands/ActivateRulesCommand.java
index de462e9ccd..fdf744c105 100644
--- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/ui/tools/internal/commands/ActivateRulesCommand.java
+++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/ui/tools/internal/commands/ActivateRulesCommand.java
@@ -15,7 +15,7 @@ import java.util.Collection;
 import org.eclipse.emf.transaction.RecordingCommand;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.sirius.diagram.DDiagram;
-import org.eclipse.sirius.diagram.description.validation.ValidationRule;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationRule;
 
 /**
  * Specific command to update activated rules.
diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/ui/tools/internal/commands/DeactivateRulesCommand.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/ui/tools/internal/commands/DeactivateRulesCommand.java
index daf45c1f0a..6efb9414bb 100644
--- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/ui/tools/internal/commands/DeactivateRulesCommand.java
+++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/ui/tools/internal/commands/DeactivateRulesCommand.java
@@ -15,7 +15,7 @@ import java.util.Collection;
 import org.eclipse.emf.transaction.RecordingCommand;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.sirius.diagram.DDiagram;
-import org.eclipse.sirius.diagram.description.validation.ValidationRule;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationRule;
 
 /**
  * Specific command to update activated rules.
diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/ui/tools/internal/properties/FiltersPropertySection.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/ui/tools/internal/properties/FiltersPropertySection.java
index ee369b4162..c85bd32902 100644
--- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/ui/tools/internal/properties/FiltersPropertySection.java
+++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/ui/tools/internal/properties/FiltersPropertySection.java
@@ -41,7 +41,6 @@ import org.eclipse.sirius.diagram.description.DiagramDescription;
 import org.eclipse.sirius.diagram.description.concern.provider.ConcernItemProviderAdapterFactory;
 import org.eclipse.sirius.diagram.description.filter.FilterDescription;
 import org.eclipse.sirius.diagram.description.filter.provider.FilterItemProviderAdapterFactory;
-import org.eclipse.sirius.diagram.description.validation.provider.ValidationItemProviderAdapterFactory;
 import org.eclipse.sirius.diagram.internal.edit.parts.DDiagramEditPart;
 import org.eclipse.sirius.diagram.provider.DiagramItemProviderAdapterFactory;
 import org.eclipse.sirius.diagram.ui.tools.internal.commands.ActivateFiltersCommand;
@@ -50,6 +49,7 @@ import org.eclipse.sirius.ecore.extender.business.api.accessor.ModelAccessor;
 import org.eclipse.sirius.ecore.extender.business.api.permission.IPermissionAuthority;
 import org.eclipse.sirius.viewpoint.SiriusPlugin;
 import org.eclipse.sirius.viewpoint.description.audit.provider.AuditItemProviderAdapterFactory;
+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;
diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/ui/tools/internal/properties/ValidationPropertySection.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/ui/tools/internal/properties/ValidationPropertySection.java
index 561a2760a5..00a7e2ef90 100644
--- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/ui/tools/internal/properties/ValidationPropertySection.java
+++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/ui/tools/internal/properties/ValidationPropertySection.java
@@ -13,9 +13,9 @@ package org.eclipse.sirius.diagram.ui.tools.internal.properties;
 import java.util.Collection;
 import java.util.HashSet;
 
-import org.eclipse.sirius.diagram.description.validation.ValidationRule;
 import org.eclipse.sirius.diagram.ui.tools.internal.commands.ActivateRulesCommand;
 import org.eclipse.sirius.diagram.ui.tools.internal.commands.DeactivateRulesCommand;
+import org.eclipse.sirius.viewpoint.description.validation.ValidationRule;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/dialect/DialectUIManagerImpl.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/dialect/DialectUIManagerImpl.java
index 6f21d7e6b1..5606338be6 100644
--- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/dialect/DialectUIManagerImpl.java
+++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/dialect/DialectUIManagerImpl.java
@@ -41,6 +41,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.sirius.viewpoint.provider.ViewpointItemProviderAdapterFactory;
 import org.eclipse.ui.IEditorPart;
 
@@ -158,6 +159,7 @@ public class DialectUIManagerImpl implements DialectUIManager {
         composed.addAdapterFactory(new ViewpointItemProviderAdapterFactory());
         composed.addAdapterFactory(new StyleItemProviderAdapterFactory());
         composed.addAdapterFactory(new ToolItemProviderAdapterFactory());
+        composed.addAdapterFactory(new ValidationItemProviderAdapterFactory());
         composed.addAdapterFactory(new AuditItemProviderAdapterFactory());
 
         for (final DialectUI dialect : dialects.values()) {