362162: [Architecture - Refactoring] The plug-ins should be renamed to match their layer's qualified name

https://bugs.eclipse.org/bugs/show_bug.cgi?id=362162

19 files changed, 69 insertions, 69 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/CreateDeploymentDiagramCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/CreateDeploymentDiagramCommand.java
index 6d78b92d2c3..ac35eb1dff2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/CreateDeploymentDiagramCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/CreateDeploymentDiagramCommand.java
@@ -10,11 +10,11 @@
  * Contributors:

  *	Amine EL KOUHEN (CEA LIST/LIFL) - Amine.El-Kouhen@lifl.fr 

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.deployment;

+package org.eclipse.papyrus.uml.diagram.deployment;

 

 import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;

 import org.eclipse.papyrus.core.adaptor.gmf.AbstractPapyrusGmfCreateDiagramCommandHandler;

-import org.eclipse.papyrus.diagram.deployment.edit.parts.DeploymentDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.DeploymentDiagramEditPart;

 

 // TODO: Auto-generated Javadoc

 /**

@@ -55,7 +55,7 @@ public class CreateDeploymentDiagramCommand extends AbstractPapyrusGmfCreateDiag
 

 	@Override

 	protected PreferencesHint getPreferenceHint() {

-		return org.eclipse.papyrus.diagram.deployment.part.UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT;

+		return org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT;

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/CreateDeploymentDiagramWithNavigationHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/CreateDeploymentDiagramWithNavigationHandler.java
index c9d59a0b048..934a89168b5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/CreateDeploymentDiagramWithNavigationHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/CreateDeploymentDiagramWithNavigationHandler.java
@@ -11,7 +11,7 @@
  *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.deployment;

+package org.eclipse.papyrus.uml.diagram.deployment;

 

 import org.eclipse.papyrus.navigation.CreateDiagramWithNavigationHandler;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/DeploymentDiagramCreationCondition.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/DeploymentDiagramCreationCondition.java
index c43b15652ae..5046e17c825 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/DeploymentDiagramCreationCondition.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/DeploymentDiagramCreationCondition.java
@@ -8,7 +8,7 @@
  * Contributors:

  *  Atos Origin - Initial API and implementation

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.deployment;

+package org.eclipse.papyrus.uml.diagram.deployment;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.papyrus.core.extension.commands.PerspectiveContextDependence;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/DeploymentDiagramEditorFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/DeploymentDiagramEditorFactory.java
index e83d28c3807..c7c4330bf6a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/DeploymentDiagramEditorFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/DeploymentDiagramEditorFactory.java
@@ -10,10 +10,10 @@
  * Contributors:

  *	Amine EL KOUHEN (CEA LIST/LIFL) - Amine.El-Kouhen@lifl.fr 

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.deployment;

+package org.eclipse.papyrus.uml.diagram.deployment;

 

 import org.eclipse.papyrus.core.adaptor.gmf.GmfEditorFactory;

-import org.eclipse.papyrus.diagram.deployment.edit.parts.DeploymentDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.DeploymentDiagramEditPart;

 

 // TODO: Auto-generated Javadoc

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/UmlDeploymentDiagramForMultiEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/UmlDeploymentDiagramForMultiEditor.java
index cb6f11917e4..7370bc2e16c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/UmlDeploymentDiagramForMultiEditor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/UmlDeploymentDiagramForMultiEditor.java
@@ -10,7 +10,7 @@
  * Contributors:

  *	Amine EL KOUHEN (CEA LIST/LIFL) - Amine.El-Kouhen@lifl.fr 

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.deployment;

+package org.eclipse.papyrus.uml.diagram.deployment;

 

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.emf.common.ui.URIEditorInput;

@@ -20,8 +20,8 @@ import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.resource.ImageDescriptor;

 import org.eclipse.papyrus.core.editor.BackboneException;

 import org.eclipse.papyrus.core.services.ServicesRegistry;

-import org.eclipse.papyrus.diagram.deployment.part.UMLDiagramEditor;

-import org.eclipse.papyrus.diagram.deployment.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditor;

+import org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorPlugin;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Shell;

 import org.eclipse.ui.IEditorInput;

@@ -140,6 +140,6 @@ public class UmlDeploymentDiagramForMultiEditor extends UMLDiagramEditor {
 

 	@Override

 	public String getEditingDomainID() {

-		return "org.eclipse.papyrus.diagram.deployment.EditingDomain";

+		return "org.eclipse.papyrus.uml.diagram.deployment.EditingDomain";

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/custom/actions/ShowHideRelatedContentsAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/actions/ShowHideRelatedContentsAction.java
index 7d1828610e9..1548f8f43d4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/custom/actions/ShowHideRelatedContentsAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/actions/ShowHideRelatedContentsAction.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.deployment.custom.actions;

+package org.eclipse.papyrus.uml.diagram.deployment.custom.actions;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -19,11 +19,11 @@ import java.util.List;
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.EditPart;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.actions.AbstractShowHideAction;

-import org.eclipse.papyrus.diagram.common.actions.ShowHideContentsAction;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideRelatedContentsEditPolicy;

-import org.eclipse.papyrus.diagram.common.providers.EditorLabelProvider;

-import org.eclipse.papyrus.diagram.deployment.custom.messages.Messages;

+import org.eclipse.papyrus.uml.diagram.common.actions.AbstractShowHideAction;

+import org.eclipse.papyrus.uml.diagram.common.actions.ShowHideContentsAction;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideRelatedContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.providers.EditorLabelProvider;

+import org.eclipse.papyrus.uml.diagram.deployment.custom.messages.Messages;

 import org.eclipse.uml2.uml.Classifier;

 import org.eclipse.uml2.uml.Property;

 import org.eclipse.uml2.uml.Type;

@@ -38,7 +38,7 @@ public class ShowHideRelatedContentsAction extends ShowHideContentsAction {
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.diagram.common.actions.AbstractShowHideAction#initAction()

+	 * @see org.eclipse.papyrus.uml.diagram.common.actions.AbstractShowHideAction#initAction()

 	 */

 	@Override

 	protected void initAction() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/custom/actions/ShowHideRelatedContentsHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/actions/ShowHideRelatedContentsHandler.java
index 488418f6c7e..49a96508d64 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/custom/actions/ShowHideRelatedContentsHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/actions/ShowHideRelatedContentsHandler.java
@@ -11,10 +11,10 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.deployment.custom.actions;

+package org.eclipse.papyrus.uml.diagram.deployment.custom.actions;

 

-import org.eclipse.papyrus.diagram.common.actions.handlers.AbstractShowHideHandler;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideRelatedContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.actions.handlers.AbstractShowHideHandler;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideRelatedContentsEditPolicy;

 

 /**

  * Handler for the {@link ShowHideRelatedContentsAction}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/custom/edit/command/CreateViewCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/edit/command/CreateViewCommand.java
index c920385a7b3..33c8eb6c2ab 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/custom/edit/command/CreateViewCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/edit/command/CreateViewCommand.java
@@ -12,7 +12,7 @@
  *

  *****************************************************************************/

 

-package org.eclipse.papyrus.diagram.deployment.custom.edit.command;

+package org.eclipse.papyrus.uml.diagram.deployment.custom.edit.command;

 

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

 import org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/custom/edit/helpers/DeploymentLinkMappingHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/edit/helpers/DeploymentLinkMappingHelper.java
index 935045fcee9..d298728fab4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/custom/edit/helpers/DeploymentLinkMappingHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/edit/helpers/DeploymentLinkMappingHelper.java
@@ -1,11 +1,11 @@
-package org.eclipse.papyrus.diagram.deployment.custom.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.deployment.custom.edit.helpers;

 

 import java.util.Collection;

 

-import org.eclipse.papyrus.diagram.common.helper.ILinkMappingHelper;

-import org.eclipse.papyrus.diagram.common.helper.LinkMappingHelper;

-import org.eclipse.papyrus.diagram.common.helper.LinkMappingHelper.CommonSourceUMLSwitch;

-import org.eclipse.papyrus.diagram.common.helper.LinkMappingHelper.CommonTargetUMLSwitch;

+import org.eclipse.papyrus.uml.diagram.common.helper.ILinkMappingHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.LinkMappingHelper;

+import org.eclipse.papyrus.uml.diagram.common.helper.LinkMappingHelper.CommonSourceUMLSwitch;

+import org.eclipse.papyrus.uml.diagram.common.helper.LinkMappingHelper.CommonTargetUMLSwitch;

 import org.eclipse.uml2.uml.Element;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/custom/edit/policies/CustomDiagramDragDropEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/edit/policies/CustomDiagramDragDropEditPolicy.java
index b64f24cc7bd..7c52890c594 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/custom/edit/policies/CustomDiagramDragDropEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/edit/policies/CustomDiagramDragDropEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *	Amine EL KOUHEN (CEA LIST/INRIA DaRT) amine.el_kouhen@inria.fr

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.deployment.custom.edit.policies;

+package org.eclipse.papyrus.uml.diagram.deployment.custom.edit.policies;

 

 import java.util.Collection;

 import java.util.HashSet;

@@ -37,23 +37,23 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.IHintedType;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editpolicies.OldCommonDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.deployment.custom.edit.command.CreateViewCommand;

-import org.eclipse.papyrus.diagram.deployment.custom.edit.helpers.DeploymentLinkMappingHelper;

-import org.eclipse.papyrus.diagram.deployment.edit.parts.ArtifactEditPart;

-import org.eclipse.papyrus.diagram.deployment.edit.parts.ArtifactEditPartACN;

-import org.eclipse.papyrus.diagram.deployment.edit.parts.ArtifactEditPartCN;

-import org.eclipse.papyrus.diagram.deployment.edit.parts.CommentEditPart;

-import org.eclipse.papyrus.diagram.deployment.edit.parts.ConstraintEditPart;

-import org.eclipse.papyrus.diagram.deployment.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.deployment.edit.parts.DeviceEditPart;

-import org.eclipse.papyrus.diagram.deployment.edit.parts.DeviceEditPartCN;

-import org.eclipse.papyrus.diagram.deployment.edit.parts.ExecutionEnvironmentEditPart;

-import org.eclipse.papyrus.diagram.deployment.edit.parts.ExecutionEnvironmentEditPartCN;

-import org.eclipse.papyrus.diagram.deployment.edit.parts.NodeEditPart;

-import org.eclipse.papyrus.diagram.deployment.edit.parts.NodeEditPartCN;

-import org.eclipse.papyrus.diagram.deployment.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.deployment.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.OldCommonDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.deployment.custom.edit.command.CreateViewCommand;

+import org.eclipse.papyrus.uml.diagram.deployment.custom.edit.helpers.DeploymentLinkMappingHelper;

+import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.ArtifactEditPart;

+import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.ArtifactEditPartACN;

+import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.ArtifactEditPartCN;

+import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.CommentEditPart;

+import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.ConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.DeviceEditPart;

+import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.DeviceEditPartCN;

+import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.ExecutionEnvironmentEditPart;

+import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.ExecutionEnvironmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.NodeEditPart;

+import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.NodeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.deployment.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.deployment.providers.UMLElementTypes;

 import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.Classifier;

 import org.eclipse.uml2.uml.Collaboration;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/custom/edit/policies/RemoveOrphanViewPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/edit/policies/RemoveOrphanViewPolicy.java
index a4befb5947b..129889050f8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/custom/edit/policies/RemoveOrphanViewPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/edit/policies/RemoveOrphanViewPolicy.java
@@ -13,12 +13,12 @@
 

  *  

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.deployment.custom.edit.policies;

+package org.eclipse.papyrus.uml.diagram.deployment.custom.edit.policies;

 

 import org.eclipse.gmf.runtime.notation.BasicCompartment;

 import org.eclipse.gmf.runtime.notation.DecorationNode;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.common.editpolicies.OrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.OrphanViewPolicy;

 

 /**

  * <pre>

@@ -31,7 +31,7 @@ import org.eclipse.papyrus.diagram.common.editpolicies.OrphanViewPolicy;
 public class RemoveOrphanViewPolicy extends OrphanViewPolicy {

 

 	/**

-	 * @see org.eclipse.papyrus.diagram.common.editpolicies.OrphanViewPolicy#isOrphaned(org.eclipse.gmf.runtime.notation.View)

+	 * @see org.eclipse.papyrus.uml.diagram.common.editpolicies.OrphanViewPolicy#isOrphaned(org.eclipse.gmf.runtime.notation.View)

 	 * @param view

 	 * @return true is the view is Orphaned

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/custom/figure/nodes/ArtifactFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/figure/nodes/ArtifactFigure.java
index 2377b43b849..5eb383e5ea4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/custom/figure/nodes/ArtifactFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/figure/nodes/ArtifactFigure.java
@@ -10,16 +10,16 @@
  * Contributors:

  *	Amine EL KOUHEN (CEA LIST/INRIA DaRT) amine.el_kouhen@inria.fr

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.deployment.custom.figure.nodes;

+package org.eclipse.papyrus.uml.diagram.deployment.custom.figure.nodes;

 

 import java.util.ArrayList;

 import java.util.List;

 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.PositionConstants;

-import org.eclipse.papyrus.diagram.common.Activator;

-import org.eclipse.papyrus.diagram.common.figure.node.CompartmentFigure;

-import org.eclipse.papyrus.diagram.deployment.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.common.Activator;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.CompartmentFigure;

+import org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorPlugin;

 import org.eclipse.swt.graphics.Image;

 

 // TODO: Auto-generated Javadoc

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/custom/figure/nodes/DeviceFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/figure/nodes/DeviceFigure.java
index 1efed29907d..096d78f2d1a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/custom/figure/nodes/DeviceFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/figure/nodes/DeviceFigure.java
@@ -10,7 +10,7 @@
  * Contributors:

  *	Amine EL KOUHEN (CEA LIST/INRIA DaRT) amine.el_kouhen@inria.fr

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.deployment.custom.figure.nodes;

+package org.eclipse.papyrus.uml.diagram.deployment.custom.figure.nodes;

 

 import org.eclipse.draw2d.IFigure;

 

@@ -31,7 +31,7 @@ public class DeviceFigure extends NodeFigure {
 	 * Gets the composite compartment figure.

 	 * 

 	 * @return the composite compartment figure

-	 * @see org.eclipse.papyrus.diagram.deployment.custom.figure.nodes.NodeFigure#getCompositeCompartmentFigure()

+	 * @see org.eclipse.papyrus.uml.diagram.deployment.custom.figure.nodes.NodeFigure#getCompositeCompartmentFigure()

 	 */

 

 	@Override

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/custom/figure/nodes/ExecutionEnvironmentFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/figure/nodes/ExecutionEnvironmentFigure.java
index 64fd39db534..a4fb943c4a2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/custom/figure/nodes/ExecutionEnvironmentFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/figure/nodes/ExecutionEnvironmentFigure.java
@@ -10,7 +10,7 @@
  * Contributors:

  *	Amine EL KOUHEN (CEA LIST/INRIA DaRT) amine.el_kouhen@inria.fr

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.deployment.custom.figure.nodes;

+package org.eclipse.papyrus.uml.diagram.deployment.custom.figure.nodes;

 

 import org.eclipse.draw2d.IFigure;

 

@@ -31,7 +31,7 @@ public class ExecutionEnvironmentFigure extends NodeFigure {
 	 * Gets the composite compartment figure.

 	 * 

 	 * @return the composite compartment figure

-	 * @see org.eclipse.papyrus.diagram.deployment.custom.figure.nodes.NodeFigure#getCompositeCompartmentFigure()

+	 * @see org.eclipse.papyrus.uml.diagram.deployment.custom.figure.nodes.NodeFigure#getCompositeCompartmentFigure()

 	 */

 

 	@Override

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/custom/figure/nodes/NodeFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/figure/nodes/NodeFigure.java
index 6307e4a482e..e62bac00886 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/custom/figure/nodes/NodeFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/figure/nodes/NodeFigure.java
@@ -10,15 +10,15 @@
  * Contributors:

  *	Amine EL KOUHEN (CEA LIST/INRIA DaRT) amine.el_kouhen@inria.fr

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.deployment.custom.figure.nodes;

+package org.eclipse.papyrus.uml.diagram.deployment.custom.figure.nodes;

 

 import java.util.ArrayList;

 import java.util.List;

 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.LineBorder;

-import org.eclipse.papyrus.diagram.common.figure.node.CompartmentFigure;

-import org.eclipse.papyrus.diagram.common.figure.node.Rectangular3DBorder;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.CompartmentFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.Rectangular3DBorder;

 

 // TODO: Auto-generated Javadoc

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/custom/messages/Messages.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/messages/Messages.java
index c0fbf5d40c5..6612bffaa6f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/custom/messages/Messages.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/messages/Messages.java
@@ -10,7 +10,7 @@
  * Contributors:

  *	Amine EL KOUHEN (CEA LIST/INRIA DaRT) amine.el_kouhen@inria.fr

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.deployment.custom.messages;

+package org.eclipse.papyrus.uml.diagram.deployment.custom.messages;

 

 import org.eclipse.osgi.util.NLS;

 

@@ -21,7 +21,7 @@ import org.eclipse.osgi.util.NLS;
 public class Messages extends NLS {

 

 	/** The Constant BUNDLE_NAME. */

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.diagram.deployment.custom.messages.messages"; //$NON-NLS-1$

+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.uml.diagram.deployment.custom.messages.messages"; //$NON-NLS-1$

 

 	/** The Create uml element dialog_ new_ element_ name. */

 	public static String CreateUmlElementDialog_New_Element_Name;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/custom/messages/messages.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/messages/messages.properties
index 52ea38c5976..52ea38c5976 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/custom/messages/messages.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/messages/messages.properties
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/custom/providers/ActionStateSourceProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/providers/ActionStateSourceProvider.java
index e0e189cdf79..41597652ccd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/custom/providers/ActionStateSourceProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/providers/ActionStateSourceProvider.java
@@ -11,10 +11,10 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.deployment.custom.providers;

+package org.eclipse.papyrus.uml.diagram.deployment.custom.providers;

 

-import org.eclipse.papyrus.diagram.common.providers.AbstractActionStateSourceProvider;

-import org.eclipse.papyrus.diagram.deployment.custom.actions.ShowHideRelatedContentsHandler;

+import org.eclipse.papyrus.uml.diagram.common.providers.AbstractActionStateSourceProvider;

+import org.eclipse.papyrus.uml.diagram.deployment.custom.actions.ShowHideRelatedContentsHandler;

 import org.eclipse.ui.ISources;

 

 /**

@@ -72,7 +72,7 @@ public class ActionStateSourceProvider extends AbstractActionStateSourceProvider
 	}

 

 	/**

-	 * @see org.eclipse.papyrus.diagram.common.providers.AbstractActionStateSourceProvider#refreshActions()

+	 * @see org.eclipse.papyrus.uml.diagram.common.providers.AbstractActionStateSourceProvider#refreshActions()

 	 */

 	@Override

 	protected void refreshActions() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/custom/providers/CustomEditPolicyProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/providers/CustomEditPolicyProvider.java
index 2766e28da49..381234c0c3c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/diagram/deployment/custom/providers/CustomEditPolicyProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/custom-src/org/eclipse/papyrus/uml/diagram/deployment/custom/providers/CustomEditPolicyProvider.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.deployment.custom.providers;

+package org.eclipse.papyrus.uml.diagram.deployment.custom.providers;

 

 import org.eclipse.gef.EditPart;

 import org.eclipse.gmf.runtime.common.core.service.IOperation;

@@ -21,9 +21,9 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation;

 import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.NavigationEditPolicy;

-import org.eclipse.papyrus.diagram.deployment.edit.parts.DeploymentDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.NavigationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.DeploymentDiagramEditPart;

 

 /**

  * this is an editpolicy provider in charge to install a policy to navigate between diagrams and elements