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

602 files changed, 5992 insertions, 5991 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/AbstractionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AbstractionCreateCommand.java
index 4040e237cc1..382d04a2c3a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/AbstractionCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AbstractionCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -23,8 +23,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Abstraction;

 import org.eclipse.uml2.uml.NamedElement;

 import org.eclipse.uml2.uml.Package;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/AbstractionReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AbstractionReorientCommand.java
index 9c230b646af..31ed352885e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/AbstractionReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AbstractionReorientCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Abstraction;

 import org.eclipse.uml2.uml.NamedElement;

 import org.eclipse.uml2.uml.Package;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/AssociationBranchCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationBranchCreateCommand.java
index 3037846267e..e2bca1e3fa4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/AssociationBranchCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationBranchCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -23,7 +23,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Association;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Type;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/AssociationBranchReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationBranchReorientCommand.java
index 5a9662ad221..752c5f316f2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/AssociationBranchReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationBranchReorientCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Association;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Type;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/AssociationClassCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationClassCreateCommand.java
index b0f2a7bd5db..00c8470b916 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/AssociationClassCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationClassCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.AssociationClass;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/AssociationClassLinkCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationClassLinkCreateCommand.java
index 2f87e8211c8..4d31d8d169f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/AssociationClassLinkCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationClassLinkCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -23,7 +23,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.AssociationClass;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Type;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/AssociationClassLinkReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationClassLinkReorientCommand.java
index 977bfaf8fab..9d8a3e36031 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/AssociationClassLinkReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationClassLinkReorientCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.AssociationClass;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Type;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/AssociationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationCreateCommand.java
index eceb72d202d..d8cad6c472f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/AssociationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -23,7 +23,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Association;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Type;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/AssociationNodeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationNodeCreateCommand.java
index 14f8e4d2b8a..e91add504f4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/AssociationNodeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationNodeCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/AssociationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationReorientCommand.java
index acd821a3935..512bc2ee2d6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/AssociationReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/AssociationReorientCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Association;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Type;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ClassCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ClassCreateCommand.java
index 5cf0ff6f7d6..211c6b4b5bd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ClassCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ClassCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ClassCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ClassCreateCommandCN.java
index 58b8f818e95..3161e1bf05d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ClassCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ClassCreateCommandCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ClassifierTemplateParameterCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ClassifierTemplateParameterCreateCommand.java
index abc92afb316..577c373c682 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ClassifierTemplateParameterCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ClassifierTemplateParameterCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/CommentAnnotatedElementCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/CommentAnnotatedElementCreateCommand.java
index 8e4e3f9a4cb..0af27d81542 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/CommentAnnotatedElementCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/CommentAnnotatedElementCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Comment;

 import org.eclipse.uml2.uml.Element;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/CommentAnnotatedElementReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/CommentAnnotatedElementReorientCommand.java
index 40e2eccb4cc..1c871bacfb5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/CommentAnnotatedElementReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/CommentAnnotatedElementReorientCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,7 +20,7 @@ import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Comment;

 import org.eclipse.uml2.uml.Element;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/CommentCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/CommentCreateCommand.java
index a6d68ac6987..d31deabc52a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/CommentCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/CommentCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Comment;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/CommentCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/CommentCreateCommandCN.java
index b00064ab194..0e8f52230b9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/CommentCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/CommentCreateCommandCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Comment;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ComponentCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ComponentCreateCommand.java
index 82971701f78..9dfcafa3b2c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ComponentCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ComponentCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Component;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ComponentCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ComponentCreateCommandCN.java
index fe3d9fe9e61..609ef1414ac 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ComponentCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ComponentCreateCommandCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Component;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ConnectableElementTemplateParameterCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConnectableElementTemplateParameterCreateCommand.java
index d22f3cdf65a..bd9d8f940d6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ConnectableElementTemplateParameterCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConnectableElementTemplateParameterCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ConnectorDurationObservationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConnectorDurationObservationCreateCommand.java
index 04e5290da69..f7e426a9937 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ConnectorDurationObservationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConnectorDurationObservationCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.DurationObservation;

 import org.eclipse.uml2.uml.NamedElement;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ConnectorDurationObservationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConnectorDurationObservationReorientCommand.java
index 0cd56797668..2267da17e8b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ConnectorDurationObservationReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConnectorDurationObservationReorientCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,7 +20,7 @@ import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.DurationObservation;

 import org.eclipse.uml2.uml.NamedElement;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ConnectorTimeObservationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConnectorTimeObservationCreateCommand.java
index c6ae09e4ab9..c304906e8d6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ConnectorTimeObservationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConnectorTimeObservationCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.NamedElement;

 import org.eclipse.uml2.uml.TimeObservation;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ConnectorTimeObservationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConnectorTimeObservationReorientCommand.java
index 84df595d669..39370ea10be 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ConnectorTimeObservationReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConnectorTimeObservationReorientCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,7 +20,7 @@ import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.NamedElement;

 import org.eclipse.uml2.uml.TimeObservation;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ConstraintConstrainedElementCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConstraintConstrainedElementCreateCommand.java
index e5abf66db7d..0a75b30198f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ConstraintConstrainedElementCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConstraintConstrainedElementCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Constraint;

 import org.eclipse.uml2.uml.Element;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ConstraintConstrainedElementReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConstraintConstrainedElementReorientCommand.java
index a8a2449033c..6b62e8850d3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ConstraintConstrainedElementReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConstraintConstrainedElementReorientCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -20,7 +20,7 @@ import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Constraint;

 import org.eclipse.uml2.uml.Element;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ConstraintCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConstraintCreateCommand.java
index d3749910443..e51d06a998a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ConstraintCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConstraintCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Constraint;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ConstraintCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConstraintCreateCommandCN.java
index 98bb92fc9f9..726b51be7c8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ConstraintCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ConstraintCreateCommandCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Constraint;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/DataTypeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DataTypeCreateCommand.java
index 721df3b7e33..a44f5f015f2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/DataTypeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DataTypeCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.DataType;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/DataTypeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DataTypeCreateCommandCN.java
index 9b88ee17d9e..d9fc59cf0a0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/DataTypeCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DataTypeCreateCommandCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.DataType;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/DefaultNamedElementCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DefaultNamedElementCreateCommand.java
index 4b1a6e96c80..d9e1cbb110b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/DefaultNamedElementCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DefaultNamedElementCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/Dependency2ReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/Dependency2ReorientCommand.java
index dcfd52a983e..3245f3553e2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/Dependency2ReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/Dependency2ReorientCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Dependency;

 import org.eclipse.uml2.uml.NamedElement;

 import org.eclipse.uml2.uml.Package;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/Dependency3CreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/Dependency3CreateCommand.java
index 0bf23d7e680..36c0c036171 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/Dependency3CreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/Dependency3CreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -23,8 +23,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Dependency;

 import org.eclipse.uml2.uml.NamedElement;

 import org.eclipse.uml2.uml.Package;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/DependencyCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DependencyCreateCommand.java
index 37d8b35891a..7018bfb7113 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/DependencyCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DependencyCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -23,8 +23,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Dependency;

 import org.eclipse.uml2.uml.NamedElement;

 import org.eclipse.uml2.uml.Package;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/DependencyNodeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DependencyNodeCreateCommand.java
index 3f7feb95761..dda7d7237a8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/DependencyNodeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DependencyNodeCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/DependencyReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DependencyReorientCommand.java
index b133c5a8d9b..8ad7debbffd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/DependencyReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DependencyReorientCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Dependency;

 import org.eclipse.uml2.uml.NamedElement;

 import org.eclipse.uml2.uml.Package;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/DurationObservationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DurationObservationCreateCommand.java
index 01c79a8f4e8..c2b6e946483 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/DurationObservationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/DurationObservationCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.DurationObservation;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ElementImportCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ElementImportCreateCommand.java
index 3ab109fe6b6..a7033773eba 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ElementImportCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ElementImportCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -23,8 +23,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.ElementImport;

 import org.eclipse.uml2.uml.Namespace;

 import org.eclipse.uml2.uml.PackageableElement;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ElementImportReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ElementImportReorientCommand.java
index 550c204ca11..fac92eafb64 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ElementImportReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ElementImportReorientCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.ElementImport;

 import org.eclipse.uml2.uml.Namespace;

 import org.eclipse.uml2.uml.PackageableElement;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/EnumerationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/EnumerationCreateCommand.java
index 58d735eee13..a952242f7f8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/EnumerationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/EnumerationCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Enumeration;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/EnumerationCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/EnumerationCreateCommandCN.java
index e960a9598b0..01ea846c169 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/EnumerationCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/EnumerationCreateCommandCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Enumeration;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/EnumerationLiteralCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/EnumerationLiteralCreateCommand.java
index 05a59e5302e..99f76e14734 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/EnumerationLiteralCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/EnumerationLiteralCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Enumeration;

 import org.eclipse.uml2.uml.EnumerationLiteral;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/GeneralizationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/GeneralizationCreateCommand.java
index d341b1ec1d5..aabe80c93b7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/GeneralizationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/GeneralizationCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -23,7 +23,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Classifier;

 import org.eclipse.uml2.uml.Generalization;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/GeneralizationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/GeneralizationReorientCommand.java
index e3f363fb8a6..8ebb41fb4f7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/GeneralizationReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/GeneralizationReorientCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Classifier;

 import org.eclipse.uml2.uml.Generalization;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/GeneralizationSetCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/GeneralizationSetCreateCommand.java
index c73f49c3ca9..6147e1232fb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/GeneralizationSetCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/GeneralizationSetCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -23,7 +23,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Generalization;

 import org.eclipse.uml2.uml.GeneralizationSet;

 import org.eclipse.uml2.uml.Package;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/GeneralizationSetReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/GeneralizationSetReorientCommand.java
index 44dd4cdf0e9..0a7e41eddf3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/GeneralizationSetReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/GeneralizationSetReorientCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Generalization;

 import org.eclipse.uml2.uml.GeneralizationSet;

 import org.eclipse.uml2.uml.Package;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/InstanceSpecificationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InstanceSpecificationCreateCommand.java
index 3d1725f79ed..1eba431723c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/InstanceSpecificationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InstanceSpecificationCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.InstanceSpecification;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/InstanceSpecificationCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InstanceSpecificationCreateCommandCN.java
index 30ee79b4668..8f0fa74748e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/InstanceSpecificationCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InstanceSpecificationCreateCommandCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.InstanceSpecification;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/InstanceSpecificationLinkCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InstanceSpecificationLinkCreateCommand.java
index 73826486ef2..77fea0ac263 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/InstanceSpecificationLinkCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InstanceSpecificationLinkCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -23,7 +23,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.InstanceSpecification;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Slot;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/InstanceSpecificationLinkReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InstanceSpecificationLinkReorientCommand.java
index 7fd12204476..0a82fc1dcb8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/InstanceSpecificationLinkReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InstanceSpecificationLinkReorientCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.InstanceSpecification;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Slot;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/InterfaceCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InterfaceCreateCommand.java
index c147a41bdb4..62499e7850f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/InterfaceCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InterfaceCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Interface;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/InterfaceCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InterfaceCreateCommandCN.java
index b8cc269cb5c..d190ef57425 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/InterfaceCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InterfaceCreateCommandCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Interface;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/InterfaceRealizationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InterfaceRealizationCreateCommand.java
index aa689251813..22b8f885484 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/InterfaceRealizationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InterfaceRealizationCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -23,8 +23,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.BehavioredClassifier;

 import org.eclipse.uml2.uml.Interface;

 import org.eclipse.uml2.uml.InterfaceRealization;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/InterfaceRealizationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InterfaceRealizationReorientCommand.java
index b0775c061e2..bd86e8ca1e6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/InterfaceRealizationReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/InterfaceRealizationReorientCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.BehavioredClassifier;

 import org.eclipse.uml2.uml.Interface;

 import org.eclipse.uml2.uml.InterfaceRealization;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ModelCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ModelCreateCommandCN.java
index 808b4e143a3..625425df6a4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ModelCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ModelCreateCommandCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Model;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ModelCreateCommandTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ModelCreateCommandTN.java
index af9ed4bf11b..6ce63c863d2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ModelCreateCommandTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ModelCreateCommandTN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Model;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/NestedClassForClassCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedClassForClassCreateCommand.java
index 0fa04975457..610d9ac3a4f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/NestedClassForClassCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedClassForClassCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.UMLFactory;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/NestedClassForComponentCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedClassForComponentCreateCommand.java
index c0db2f27bca..02e2230960a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/NestedClassForComponentCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedClassForComponentCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.UMLFactory;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/NestedClassForInterfaceCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedClassForInterfaceCreateCommand.java
index d3f39d51744..ac0b50dc348 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/NestedClassForInterfaceCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/NestedClassForInterfaceCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.Interface;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/OperationForClassCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/OperationForClassCommand.java
index 2752a972e47..4498242a6f3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/OperationForClassCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/OperationForClassCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.Operation;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/OperationForComponentCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/OperationForComponentCreateCommand.java
index d134999ab86..cf8fbfe3948 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/OperationForComponentCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/OperationForComponentCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.Operation;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/OperationForDataTypeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/OperationForDataTypeCreateCommand.java
index 5f9af56c703..e606c6c7dfd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/OperationForDataTypeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/OperationForDataTypeCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.DataType;

 import org.eclipse.uml2.uml.Operation;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/OperationForInterfaceCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/OperationForInterfaceCreateCommand.java
index 01890027a1e..2d9ef1f9d5e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/OperationForInterfaceCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/OperationForInterfaceCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Interface;

 import org.eclipse.uml2.uml.Operation;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/OperationTemplateParameterCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/OperationTemplateParameterCreateCommand.java
index a6aa8f10089..540d30d74bf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/OperationTemplateParameterCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/OperationTemplateParameterCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/PackageCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PackageCreateCommand.java
index a45ca19cb56..6bb65c5095c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/PackageCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PackageCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/PackageCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PackageCreateCommandCN.java
index 81b8d6d8d1f..14a43c53dc7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/PackageCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PackageCreateCommandCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/PackageImportCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PackageImportCreateCommand.java
index 80ccece5cd6..3a607e5fe7b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/PackageImportCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PackageImportCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -23,7 +23,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Namespace;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.PackageImport;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/PackageImportReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PackageImportReorientCommand.java
index 5832edec190..401520ff378 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/PackageImportReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PackageImportReorientCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Namespace;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.PackageImport;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/PackageMergeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PackageMergeCreateCommand.java
index ffaddf1cadf..475d096bb74 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/PackageMergeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PackageMergeCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -23,7 +23,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.PackageMerge;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/PackageMergeReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PackageMergeReorientCommand.java
index 959cd46a08f..0422e3d351e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/PackageMergeReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PackageMergeReorientCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.PackageMerge;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/PrimitiveTypeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PrimitiveTypeCreateCommand.java
index 25d3224be4a..6e4c4ab0777 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/PrimitiveTypeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PrimitiveTypeCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.PrimitiveType;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/PrimitiveTypeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PrimitiveTypeCreateCommandCN.java
index cc3568f1216..2a1f1ebaf05 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/PrimitiveTypeCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PrimitiveTypeCreateCommandCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.PrimitiveType;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ProfileApplicationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ProfileApplicationCreateCommand.java
index 9219068ca5a..5ab84c93226 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ProfileApplicationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ProfileApplicationCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -23,7 +23,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Profile;

 import org.eclipse.uml2.uml.ProfileApplication;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ProfileApplicationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ProfileApplicationReorientCommand.java
index 0158290b406..2b24f33dbef 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ProfileApplicationReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ProfileApplicationReorientCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Profile;

 import org.eclipse.uml2.uml.ProfileApplication;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/PropertyForClassCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PropertyForClassCreateCommand.java
index 1ce393174cb..475417428b1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/PropertyForClassCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PropertyForClassCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Property;

 import org.eclipse.uml2.uml.StructuredClassifier;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/PropertyForComponentCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PropertyForComponentCreateCommand.java
index 3fab187c8c6..4effa990019 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/PropertyForComponentCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PropertyForComponentCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Property;

 import org.eclipse.uml2.uml.StructuredClassifier;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/PropertyForInterfaceCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PropertyForInterfaceCreateCommand.java
index c75f3882a28..a221c94d395 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/PropertyForInterfaceCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PropertyForInterfaceCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Interface;

 import org.eclipse.uml2.uml.Property;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/PropertyForSignalCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PropertyForSignalCreateCommand.java
index c0073d56ca9..f8ddda35c25 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/PropertyForSignalCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PropertyForSignalCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Property;

 import org.eclipse.uml2.uml.Signal;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/PropertyforDataTypeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PropertyforDataTypeCreateCommand.java
index 64ee89f7b2d..b7b9b76484b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/PropertyforDataTypeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/PropertyforDataTypeCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.DataType;

 import org.eclipse.uml2.uml.Property;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/RealizationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/RealizationCreateCommand.java
index e5c6b5e1a4b..225a11032d5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/RealizationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/RealizationCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -23,8 +23,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.NamedElement;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Realization;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/RealizationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/RealizationReorientCommand.java
index a706ebe45cc..6b2823ff428 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/RealizationReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/RealizationReorientCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.NamedElement;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Realization;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ReceptionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ReceptionCreateCommand.java
index 6d40e8ddffe..d9709acdb68 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ReceptionCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ReceptionCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.Reception;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/RedefinableTemplateSignatureCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/RedefinableTemplateSignatureCreateCommand.java
index 1b5aea8d8c2..6a1b3d4336d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/RedefinableTemplateSignatureCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/RedefinableTemplateSignatureCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.RedefinableTemplateSignature;

 import org.eclipse.uml2.uml.TemplateableElement;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ShapeNamedElementCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ShapeNamedElementCreateCommand.java
index dcd494736e5..2be91951cd6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ShapeNamedElementCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ShapeNamedElementCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ShortCutDiagramCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ShortCutDiagramCreateCommand.java
index 24bfc78b869..fdb9a99fa66 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/ShortCutDiagramCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/ShortCutDiagramCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/SignalCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/SignalCreateCommand.java
index bf03d946b25..6e048177e16 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/SignalCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/SignalCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Signal;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/SignalCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/SignalCreateCommandCN.java
index 2cecd7cde04..1e0cda5881f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/SignalCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/SignalCreateCommandCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Signal;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/SlotCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/SlotCreateCommand.java
index 459edff9c54..427e3574649 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/SlotCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/SlotCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/SubstitutionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/SubstitutionCreateCommand.java
index 94f3c0ed3ef..fb558588a9f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/SubstitutionCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/SubstitutionCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -23,8 +23,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Classifier;

 import org.eclipse.uml2.uml.Substitution;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/SubstitutionReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/SubstitutionReorientCommand.java
index c09d44e5331..f9764bd3e32 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/SubstitutionReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/SubstitutionReorientCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.Classifier;

 import org.eclipse.uml2.uml.Substitution;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/TemplateBindingCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/TemplateBindingCreateCommand.java
index 0e2d302169b..58804686ac3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/TemplateBindingCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/TemplateBindingCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -23,7 +23,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.TemplateBinding;

 import org.eclipse.uml2.uml.TemplateableElement;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/TemplateBindingReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/TemplateBindingReorientCommand.java
index eff5bb04882..03de68107fe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/TemplateBindingReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/TemplateBindingReorientCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.TemplateBinding;

 import org.eclipse.uml2.uml.TemplateableElement;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/TemplateParameterCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/TemplateParameterCreateCommand.java
index 387c12bb5f3..1a9ef435ade 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/TemplateParameterCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/TemplateParameterCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/TemplateSignatureCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/TemplateSignatureCreateCommand.java
index e7588a4afd4..2dc7fdd89ed 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/TemplateSignatureCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/TemplateSignatureCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/TimeObservationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/TimeObservationCreateCommand.java
index 1d5b1aef1ed..42d94c6dc69 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/TimeObservationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/TimeObservationCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

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

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.TimeObservation;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/UsageCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/UsageCreateCommand.java
index 603f55638f5..5c07c8b8dd1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/UsageCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/UsageCreateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -23,8 +23,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.uml2.uml.NamedElement;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/UsageReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/UsageReorientCommand.java
index 610e1d49517..f17ba687898 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/commands/UsageReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/commands/UsageReorientCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.commands;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.commands;

 

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.runtime.IAdaptable;

@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

 import org.eclipse.uml2.uml.NamedElement;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.Usage;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/AbstractionEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/AbstractionEditHelper.java
index ac03fb17b3d..ccd007d8025 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/AbstractionEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/AbstractionEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/AssociationClassEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/AssociationClassEditHelper.java
index 1999f606d79..084b26eccad 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/AssociationClassEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/AssociationClassEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/AssociationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/AssociationEditHelper.java
index f1ff6e50b60..368d2c35f76 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/AssociationEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/AssociationEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/ClassEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ClassEditHelper.java
index d773ee3ac97..4ca5d24f96e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/ClassEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ClassEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/ClassifierTemplateParameterEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ClassifierTemplateParameterEditHelper.java
index d740d304ff2..c53b13e426d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/ClassifierTemplateParameterEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ClassifierTemplateParameterEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/CommentEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/CommentEditHelper.java
index 81eca83c874..825c3cd77ed 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/CommentEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/CommentEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/ComponentEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ComponentEditHelper.java
index e4ebde81df6..d3dc103c03a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/ComponentEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ComponentEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/ConstraintEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ConstraintEditHelper.java
index 4e1f47637aa..fa8ca4b7779 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/ConstraintEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ConstraintEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/DataTypeEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/DataTypeEditHelper.java
index 800e85d810c..3e4e7c36d02 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/DataTypeEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/DataTypeEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/DefaultNamedElementEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/DefaultNamedElementEditHelper.java
index 805734820a9..10aa3c3d72d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/DefaultNamedElementEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/DefaultNamedElementEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/DependencyEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/DependencyEditHelper.java
index 2c268e5e9ea..a60128a3f1c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/DependencyEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/DependencyEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/DurationObservationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/DurationObservationEditHelper.java
index e17c01b899b..e77de5d500f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/DurationObservationEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/DurationObservationEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/ElementImportEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ElementImportEditHelper.java
index a9486135a44..c9d8c30b108 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/ElementImportEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ElementImportEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/EnumerationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/EnumerationEditHelper.java
index b776ab4a4a5..3df1854d6cf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/EnumerationEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/EnumerationEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/EnumerationLiteralEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/EnumerationLiteralEditHelper.java
index c2590ed9196..2f5287862ca 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/EnumerationLiteralEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/EnumerationLiteralEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/GeneralizationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/GeneralizationEditHelper.java
index 4aa21ebf1db..53a0cca0330 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/GeneralizationEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/GeneralizationEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/GeneralizationSetEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/GeneralizationSetEditHelper.java
index b1b0b8a36c7..4e4628e481e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/GeneralizationSetEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/GeneralizationSetEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/InstanceSpecificationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/InstanceSpecificationEditHelper.java
index 551e2652e62..afdbd84903a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/InstanceSpecificationEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/InstanceSpecificationEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/InstanceSpecificationLinkEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/InstanceSpecificationLinkEditHelper.java
index 105c66bd495..a0ec50b7157 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/InstanceSpecificationLinkEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/InstanceSpecificationLinkEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/InterfaceEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/InterfaceEditHelper.java
index ca119905746..5d9f77741ad 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/InterfaceEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/InterfaceEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/InterfaceRealizationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/InterfaceRealizationEditHelper.java
index 15a272e48b6..10dce2c78ea 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/InterfaceRealizationEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/InterfaceRealizationEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/ModelEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ModelEditHelper.java
index 18f09fbcc69..ab6b6cbb617 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/ModelEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ModelEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/OperationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/OperationEditHelper.java
index ab79e28ba35..bf63eed931f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/OperationEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/OperationEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/PackageEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/PackageEditHelper.java
index 330cbe975a2..2f206a5cbca 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/PackageEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/PackageEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/PackageImportEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/PackageImportEditHelper.java
index 3f763ec879e..10e4f40411a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/PackageImportEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/PackageImportEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/PackageMergeEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/PackageMergeEditHelper.java
index 6f370f7466d..446f10ed037 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/PackageMergeEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/PackageMergeEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/PrimitiveTypeEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/PrimitiveTypeEditHelper.java
index 44e4dd98cc3..fde0c23aeb1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/PrimitiveTypeEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/PrimitiveTypeEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/ProfileApplicationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ProfileApplicationEditHelper.java
index cc1f4c7acd6..fd36b653344 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/ProfileApplicationEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ProfileApplicationEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/PropertyEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/PropertyEditHelper.java
index 195f402bf51..fdafccdc17a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/PropertyEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/PropertyEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/RealizationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/RealizationEditHelper.java
index 2f385bb602b..a42c5fcf501 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/RealizationEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/RealizationEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/ReceptionEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ReceptionEditHelper.java
index f7529fd40d9..0ed6dedb656 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/ReceptionEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ReceptionEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/RedefinableTemplateSignatureEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/RedefinableTemplateSignatureEditHelper.java
index 2a95724a0b7..3c6ff35d115 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/RedefinableTemplateSignatureEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/RedefinableTemplateSignatureEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/ShapeNamedElementEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ShapeNamedElementEditHelper.java
index 040ca8d786b..516d6151fe9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/ShapeNamedElementEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ShapeNamedElementEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/ShortCutDiagramEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ShortCutDiagramEditHelper.java
index b6e013798a8..2a42859c07f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/ShortCutDiagramEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/ShortCutDiagramEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/SignalEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/SignalEditHelper.java
index 6c1243ecbcf..a1c56ffa0f7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/SignalEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/SignalEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/SlotEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/SlotEditHelper.java
index 7e8468724ab..ef329d9d259 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/SlotEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/SlotEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/SubstitutionEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/SubstitutionEditHelper.java
index 44992dde3aa..c14e00403c0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/SubstitutionEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/SubstitutionEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/TemplateBindingEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/TemplateBindingEditHelper.java
index 7cb2c119aaa..58becf99e21 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/TemplateBindingEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/TemplateBindingEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/TemplateParameterEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/TemplateParameterEditHelper.java
index dcf0fb725f7..76a8f663394 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/TemplateParameterEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/TemplateParameterEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/TimeObservationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/TimeObservationEditHelper.java
index 86972e8828e..76bb3f82769 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/TimeObservationEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/TimeObservationEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/UMLBaseEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/UMLBaseEditHelper.java
index 9e2902aaaff..7193ecefb12 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/UMLBaseEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/UMLBaseEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

 import org.eclipse.gmf.runtime.common.core.command.ICommand;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/UsageEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/UsageEditHelper.java
index 374f1f61e44..9df80cbf336 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/helpers/UsageEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/UsageEditHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.helpers;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.helpers;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AbstractionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AbstractionEditPart.java
index 1aa59d8de10..400f6134094 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AbstractionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AbstractionEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gef.EditPart;

@@ -18,13 +18,13 @@ import org.eclipse.gef.EditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

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

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomAbstractionItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.AbstractionItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.common.editparts.UMLConnectionNodeEditPart;

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

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

-import org.eclipse.papyrus.diagram.common.figure.edge.DashedEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomAbstractionItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.AbstractionItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

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

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

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AbstractionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AbstractionNameEditPart.java
index fd7e3cc4466..5bfbc50f7ce 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AbstractionNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AbstractionNameEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +59,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -125,7 +125,7 @@ public class AbstractionNameEditPart extends LabelEditPart implements ITextAware
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionNameEditPart.VISUAL_ID), new Point(0, 40));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionNameEditPart.VISUAL_ID), new Point(0, 40));

 	}

 

 	/**

@@ -345,7 +345,7 @@ public class AbstractionNameEditPart extends LabelEditPart implements ITextAware
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Abstraction_4006, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Abstraction_4006, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -600,7 +600,7 @@ public class AbstractionNameEditPart extends LabelEditPart implements ITextAware
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -754,7 +754,7 @@ public class AbstractionNameEditPart extends LabelEditPart implements ITextAware
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AppliedStereotypeAbstractionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeAbstractionEditPart.java
index b42777e8275..16c68eb819d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AppliedStereotypeAbstractionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeAbstractionEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +59,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -125,7 +125,7 @@ public class AppliedStereotypeAbstractionEditPart extends LabelEditPart implemen
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotypeAbstractionEditPart.VISUAL_ID), new Point(0, 60));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeAbstractionEditPart.VISUAL_ID), new Point(0, 60));

 	}

 

 	/**

@@ -341,7 +341,7 @@ public class AppliedStereotypeAbstractionEditPart extends LabelEditPart implemen
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Abstraction_4006, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotypeAbstractionEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Abstraction_4006, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeAbstractionEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -589,7 +589,7 @@ public class AppliedStereotypeAbstractionEditPart extends LabelEditPart implemen
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AppliedStereotypeAssociationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeAssociationEditPart.java
index 374f79940be..f4a2439d651 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AppliedStereotypeAssociationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeAssociationEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +59,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -125,7 +125,7 @@ public class AppliedStereotypeAssociationEditPart extends LabelEditPart implemen
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotypeAssociationEditPart.VISUAL_ID), new Point(0, -20));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeAssociationEditPart.VISUAL_ID), new Point(0, -20));

 	}

 

 	/**

@@ -341,7 +341,7 @@ public class AppliedStereotypeAssociationEditPart extends LabelEditPart implemen
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Association_4001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotypeAssociationEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Association_4001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeAssociationEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -589,7 +589,7 @@ public class AppliedStereotypeAssociationEditPart extends LabelEditPart implemen
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AppliedStereotypeDependencyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeDependencyEditPart.java
index 4b6626a73bd..d30824b0177 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AppliedStereotypeDependencyEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeDependencyEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +59,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -125,7 +125,7 @@ public class AppliedStereotypeDependencyEditPart extends LabelEditPart implement
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotypeDependencyEditPart.VISUAL_ID), new Point(0, 60));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeDependencyEditPart.VISUAL_ID), new Point(0, 60));

 	}

 

 	/**

@@ -341,7 +341,7 @@ public class AppliedStereotypeDependencyEditPart extends LabelEditPart implement
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_4008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotypeDependencyEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_4008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeDependencyEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -589,7 +589,7 @@ public class AppliedStereotypeDependencyEditPart extends LabelEditPart implement
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AppliedStereotypeElementImportEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeElementImportEditPart.java
index 840fa6470ab..d3833486e65 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AppliedStereotypeElementImportEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeElementImportEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +59,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -125,7 +125,7 @@ public class AppliedStereotypeElementImportEditPart extends LabelEditPart implem
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotypeElementImportEditPart.VISUAL_ID), new Point(0, 60));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeElementImportEditPart.VISUAL_ID), new Point(0, 60));

 	}

 

 	/**

@@ -341,7 +341,7 @@ public class AppliedStereotypeElementImportEditPart extends LabelEditPart implem
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.ElementImport_4009, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotypeElementImportEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.ElementImport_4009, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeElementImportEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -589,7 +589,7 @@ public class AppliedStereotypeElementImportEditPart extends LabelEditPart implem
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AppliedStereotypeGeneralizationSetLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeGeneralizationSetLabelEditPart.java
index 14a6e66a759..cd3f0b40339 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AppliedStereotypeGeneralizationSetLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeGeneralizationSetLabelEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +59,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -125,7 +125,7 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends LabelEditPa
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotypeGeneralizationSetLabelEditPart.VISUAL_ID), new Point(0, 40));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeGeneralizationSetLabelEditPart.VISUAL_ID), new Point(0, 40));

 	}

 

 	/**

@@ -341,7 +341,7 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends LabelEditPa
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.GeneralizationSet_4020, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotypeGeneralizationSetLabelEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.GeneralizationSet_4020, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeGeneralizationSetLabelEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -589,7 +589,7 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends LabelEditPa
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AppliedStereotypeInterfaceRealizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeInterfaceRealizationEditPart.java
index f06fb26ba5f..25d02b55ec5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AppliedStereotypeInterfaceRealizationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeInterfaceRealizationEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +59,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -125,7 +125,7 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends LabelEditPart
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotypeInterfaceRealizationEditPart.VISUAL_ID), new Point(0, 40));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeInterfaceRealizationEditPart.VISUAL_ID), new Point(0, 40));

 	}

 

 	/**

@@ -341,7 +341,7 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends LabelEditPart
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.InterfaceRealization_4003, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotypeInterfaceRealizationEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.InterfaceRealization_4003, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeInterfaceRealizationEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -589,7 +589,7 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends LabelEditPart
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AppliedStereotypePackageImportEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypePackageImportEditPart.java
index e8165821717..fb11569463b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AppliedStereotypePackageImportEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypePackageImportEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +59,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -125,7 +125,7 @@ public class AppliedStereotypePackageImportEditPart extends LabelEditPart implem
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotypePackageImportEditPart.VISUAL_ID), new Point(0, 40));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypePackageImportEditPart.VISUAL_ID), new Point(0, 40));

 	}

 

 	/**

@@ -341,7 +341,7 @@ public class AppliedStereotypePackageImportEditPart extends LabelEditPart implem
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.PackageImport_4010, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotypePackageImportEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.PackageImport_4010, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypePackageImportEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -589,7 +589,7 @@ public class AppliedStereotypePackageImportEditPart extends LabelEditPart implem
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AppliedStereotypePackageMergeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypePackageMergeEditPart.java
index c00bfc554c6..e2ce3dba300 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AppliedStereotypePackageMergeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypePackageMergeEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +59,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -125,7 +125,7 @@ public class AppliedStereotypePackageMergeEditPart extends LabelEditPart impleme
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotypePackageMergeEditPart.VISUAL_ID), new Point(0, 40));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypePackageMergeEditPart.VISUAL_ID), new Point(0, 40));

 	}

 

 	/**

@@ -341,7 +341,7 @@ public class AppliedStereotypePackageMergeEditPart extends LabelEditPart impleme
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.PackageMerge_4011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotypePackageMergeEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.PackageMerge_4011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypePackageMergeEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -589,7 +589,7 @@ public class AppliedStereotypePackageMergeEditPart extends LabelEditPart impleme
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AppliedStereotypeRealizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeRealizationEditPart.java
index 5591e7a8496..d8bc7468524 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AppliedStereotypeRealizationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeRealizationEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +59,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -125,7 +125,7 @@ public class AppliedStereotypeRealizationEditPart extends LabelEditPart implemen
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotypeRealizationEditPart.VISUAL_ID), new Point(0, 40));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeRealizationEditPart.VISUAL_ID), new Point(0, 40));

 	}

 

 	/**

@@ -341,7 +341,7 @@ public class AppliedStereotypeRealizationEditPart extends LabelEditPart implemen
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Realization_4005, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotypeRealizationEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Realization_4005, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeRealizationEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -589,7 +589,7 @@ public class AppliedStereotypeRealizationEditPart extends LabelEditPart implemen
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AppliedStereotypeSubstitutionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeSubstitutionEditPart.java
index 473f9ef2300..20cdca5d3ea 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AppliedStereotypeSubstitutionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeSubstitutionEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +59,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -125,7 +125,7 @@ public class AppliedStereotypeSubstitutionEditPart extends LabelEditPart impleme
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotypeSubstitutionEditPart.VISUAL_ID), new Point(0, 40));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeSubstitutionEditPart.VISUAL_ID), new Point(0, 40));

 	}

 

 	/**

@@ -341,7 +341,7 @@ public class AppliedStereotypeSubstitutionEditPart extends LabelEditPart impleme
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Substitution_4004, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotypeSubstitutionEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Substitution_4004, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeSubstitutionEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -589,7 +589,7 @@ public class AppliedStereotypeSubstitutionEditPart extends LabelEditPart impleme
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AppliedStereotypeTemplateBindingEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeTemplateBindingEditPart.java
index 42a228c2738..0a6409bddf0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AppliedStereotypeTemplateBindingEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeTemplateBindingEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +59,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -125,7 +125,7 @@ public class AppliedStereotypeTemplateBindingEditPart extends LabelEditPart impl
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotypeTemplateBindingEditPart.VISUAL_ID), new Point(0, 20));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeTemplateBindingEditPart.VISUAL_ID), new Point(0, 20));

 	}

 

 	/**

@@ -341,7 +341,7 @@ public class AppliedStereotypeTemplateBindingEditPart extends LabelEditPart impl
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.TemplateBinding_4015, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotypeTemplateBindingEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.TemplateBinding_4015, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeTemplateBindingEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -589,7 +589,7 @@ public class AppliedStereotypeTemplateBindingEditPart extends LabelEditPart impl
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AppliedStereotypeUsageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeUsageEditPart.java
index 8389673fbd5..2af066d67c2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AppliedStereotypeUsageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeUsageEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +59,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -125,7 +125,7 @@ public class AppliedStereotypeUsageEditPart extends LabelEditPart implements ITe
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotypeUsageEditPart.VISUAL_ID), new Point(0, 60));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeUsageEditPart.VISUAL_ID), new Point(0, 60));

 	}

 

 	/**

@@ -341,7 +341,7 @@ public class AppliedStereotypeUsageEditPart extends LabelEditPart implements ITe
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Usage_4007, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotypeUsageEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Usage_4007, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeUsageEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -589,7 +589,7 @@ public class AppliedStereotypeUsageEditPart extends LabelEditPart implements ITe
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AppliedStereotyperGeneralizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotyperGeneralizationEditPart.java
index 68256f9fa8c..4264a09152f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AppliedStereotyperGeneralizationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotyperGeneralizationEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +59,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -125,7 +125,7 @@ public class AppliedStereotyperGeneralizationEditPart extends LabelEditPart impl
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotyperGeneralizationEditPart.VISUAL_ID), new Point(0, 40));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotyperGeneralizationEditPart.VISUAL_ID), new Point(0, 40));

 	}

 

 	/**

@@ -341,7 +341,7 @@ public class AppliedStereotyperGeneralizationEditPart extends LabelEditPart impl
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Generalization_4002, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotyperGeneralizationEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Generalization_4002, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotyperGeneralizationEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -589,7 +589,7 @@ public class AppliedStereotyperGeneralizationEditPart extends LabelEditPart impl
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationBranchEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationBranchEditPart.java
index f05e7cc877f..67cc9822229 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationBranchEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationBranchEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gef.EditPart;

@@ -18,11 +18,11 @@ import org.eclipse.gef.EditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

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

-import org.eclipse.papyrus.diagram.clazz.custom.edit.part.AbstractAssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.custom.figure.AssociationFigure;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomAssociationBranchItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.AssociationBranchItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.AbstractAssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.AssociationFigure;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomAssociationBranchItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.AssociationBranchItemSemanticEditPolicy;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationBranchMutliplicityEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationBranchMutliplicityEditPart.java
index 41dc40fb13c..0cb804efa5c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationBranchMutliplicityEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationBranchMutliplicityEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,17 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.DisplayAssociationBranchEndMultiplicityEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.DisplayAssociationEndTargetMultiplicityEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -70,6 +59,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.DisplayAssociationBranchEndMultiplicityEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.DisplayAssociationEndTargetMultiplicityEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -127,7 +127,7 @@ public class AssociationBranchMutliplicityEditPart extends LabelEditPart impleme
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationBranchMutliplicityEditPart.VISUAL_ID), new Point(0, 20));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchMutliplicityEditPart.VISUAL_ID), new Point(0, 20));

 	}

 

 	/**

@@ -344,7 +344,7 @@ public class AssociationBranchMutliplicityEditPart extends LabelEditPart impleme
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Association_4019, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationBranchMutliplicityEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Association_4019, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchMutliplicityEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -592,7 +592,7 @@ public class AssociationBranchMutliplicityEditPart extends LabelEditPart impleme
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -736,7 +736,7 @@ public class AssociationBranchMutliplicityEditPart extends LabelEditPart impleme
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/MultiplicityHandler.gif";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/MultiplicityHandler.gif";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationBranchRoleEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationBranchRoleEditPart.java
index 89800f3262c..75472612e6a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationBranchRoleEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationBranchRoleEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,17 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.DisplayAssociationBranchEndEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.DisplayAssociationEndTargetEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -70,6 +59,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.DisplayAssociationBranchEndEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.DisplayAssociationEndTargetEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -127,7 +127,7 @@ public class AssociationBranchRoleEditPart extends LabelEditPart implements ITex
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationBranchRoleEditPart.VISUAL_ID), new Point(0, -20));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchRoleEditPart.VISUAL_ID), new Point(0, -20));

 	}

 

 	/**

@@ -344,7 +344,7 @@ public class AssociationBranchRoleEditPart extends LabelEditPart implements ITex
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Association_4019, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationBranchRoleEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Association_4019, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchRoleEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -592,7 +592,7 @@ public class AssociationBranchRoleEditPart extends LabelEditPart implements ITex
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -736,7 +736,7 @@ public class AssociationBranchRoleEditPart extends LabelEditPart implements ITex
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/role.gif";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/role.gif";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationClassAttributeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassAttributeCompartmentEditPart.java
index 4a25349f5db..1dc48f3ce1c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationClassAttributeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassAttributeCompartmentEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -25,12 +25,12 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

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

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

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.AssociationClassAttributeCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

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

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.AssociationClassAttributeCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

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

 

 /**

  * @generated

@@ -79,7 +79,7 @@ extends ResizeableListCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.AssociationClassAttributeCompartmentCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.AssociationClassAttributeCompartmentCanonicalEditPolicy());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationClassDashedLinkEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassDashedLinkEditPart.java
index cc92160a81d..9ac08020c0f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationClassDashedLinkEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassDashedLinkEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.draw2d.Graphics;

@@ -21,7 +21,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ViewComponentEditPolicy;

 import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;

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

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationClassEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassEditPart.java
index 1dfe6c575cd..5c4558472fc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationClassEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -42,22 +42,22 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomAssociationClassItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.AssociationClassItemSemanticEditPolicy;

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

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

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

-import org.eclipse.papyrus.diagram.common.editparts.ClassifierEditPart;

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

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

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

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

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

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

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

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomAssociationClassItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.AssociationClassItemSemanticEditPolicy;

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

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

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

+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

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

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

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

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

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

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

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

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -371,7 +371,7 @@ ClassifierEditPart {
 	 */

 	public List<IElementType> getMARelTypesOnSourceAndTarget(IGraphicalEditPart targetEditPart) {

 		LinkedList<IElementType> types = new LinkedList<IElementType>();

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassEditPart) {

 			types.add(UMLElementTypes.AssociationClass_4017);

 		}

 		if(targetEditPart instanceof AssociationNodeEditPart) {

@@ -419,7 +419,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof DataTypeEditPartCN) {

 			types.add(UMLElementTypes.AssociationClass_4017);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassEditPart) {

 			types.add(UMLElementTypes.Association_4001);

 		}

 		if(targetEditPart instanceof AssociationNodeEditPart) {

@@ -467,7 +467,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof DataTypeEditPartCN) {

 			types.add(UMLElementTypes.Association_4001);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassEditPart) {

 			types.add(UMLElementTypes.Association_4019);

 		}

 		if(targetEditPart instanceof AssociationNodeEditPart) {

@@ -515,7 +515,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof DataTypeEditPartCN) {

 			types.add(UMLElementTypes.Association_4019);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassEditPart) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

 		if(targetEditPart instanceof AssociationNodeEditPart) {

@@ -569,7 +569,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof InterfaceEditPartCN) {

 			types.add(UMLElementTypes.InterfaceRealization_4003);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassEditPart) {

 			types.add(UMLElementTypes.Substitution_4004);

 		}

 		if(targetEditPart instanceof AssociationNodeEditPart) {

@@ -620,7 +620,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassEditPart) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

 		if(targetEditPart instanceof AssociationNodeEditPart) {

@@ -710,7 +710,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassEditPart) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

 		if(targetEditPart instanceof AssociationNodeEditPart) {

@@ -800,7 +800,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassEditPart) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

 		if(targetEditPart instanceof AssociationNodeEditPart) {

@@ -890,7 +890,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof AssociationNodeEditPart) {

@@ -980,7 +980,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof AssociationNodeEditPart) {

@@ -1070,7 +1070,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassEditPart) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

 		if(targetEditPart instanceof AssociationNodeEditPart) {

@@ -1160,7 +1160,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PackageEditPartCN) {

 			types.add(UMLElementTypes.PackageImport_4010);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassEditPart) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

 		if(targetEditPart instanceof AssociationNodeEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationClassLinkEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassLinkEditPart.java
index 65e0ceb17dc..bbad7a831c8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationClassLinkEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassLinkEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gef.EditPart;

@@ -18,11 +18,11 @@ import org.eclipse.gef.EditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

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

-import org.eclipse.papyrus.diagram.clazz.custom.edit.part.AbstractAssociationEditPart;

-import org.eclipse.papyrus.diagram.clazz.custom.figure.AssociationFigure;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomAssociationClassLinkItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.AssociationClassLinkItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.AbstractAssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.AssociationFigure;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomAssociationClassLinkItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.AssociationClassLinkItemSemanticEditPolicy;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationClassNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassNameEditPart.java
index f7e0f5fb2c0..f0b185eb3c3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationClassNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassNameEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

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

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

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

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,8 +59,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

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

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

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

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -339,7 +339,7 @@ public class AssociationClassNameEditPart extends CompartmentEditPart implements
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.AssociationClass_2013, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.AssociationClass_2013, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -587,7 +587,7 @@ public class AssociationClassNameEditPart extends CompartmentEditPart implements
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationClassNestedClassifierCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassNestedClassifierCompartmentEditPart.java
index 7905925429a..4f58b41ff56 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationClassNestedClassifierCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassNestedClassifierCompartmentEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -26,12 +26,12 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

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

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

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.NestedClazzCompartmentCreationEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.AssociationClassNestedClassifierCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

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

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedClazzCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.AssociationClassNestedClassifierCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

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

 

 /**

  * @generated

@@ -80,7 +80,7 @@ extends ListCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.AssociationClassNestedClassifierCompartmentCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.AssociationClassNestedClassifierCompartmentCanonicalEditPolicy());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationClassOperationCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassOperationCompartmentEditPart.java
index 9893b352cdd..64cc5b29bd8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationClassOperationCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassOperationCompartmentEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -26,11 +26,11 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

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

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

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.AssociationClassOperationCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

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

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.AssociationClassOperationCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

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

 

 /**

  * @generated

@@ -79,7 +79,7 @@ extends ListCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.AssociationClassOperationCompartmentCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.AssociationClassOperationCompartmentCanonicalEditPolicy());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationClassRoleSourceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassRoleSourceEditPart.java
index 46c0c7d4383..c8518587866 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationClassRoleSourceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassRoleSourceEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,16 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.DisplayAssociationEndTargetEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,6 +59,16 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.DisplayAssociationEndTargetEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -126,7 +126,7 @@ public class AssociationClassRoleSourceEditPart extends LabelEditPart implements
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassRoleSourceEditPart.VISUAL_ID), new Point(0, -20));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassRoleSourceEditPart.VISUAL_ID), new Point(0, -20));

 	}

 

 	/**

@@ -343,7 +343,7 @@ public class AssociationClassRoleSourceEditPart extends LabelEditPart implements
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.AssociationClass_4017, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassRoleSourceEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.AssociationClass_4017, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassRoleSourceEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -591,7 +591,7 @@ public class AssociationClassRoleSourceEditPart extends LabelEditPart implements
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -735,7 +735,7 @@ public class AssociationClassRoleSourceEditPart extends LabelEditPart implements
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/role.gif";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/role.gif";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationClassRoleTargetEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassRoleTargetEditPart.java
index 9d45a8d7156..236864e5f24 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationClassRoleTargetEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassRoleTargetEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,16 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.DisplayAssociationEndSourceEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,6 +59,16 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.DisplayAssociationEndSourceEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -126,7 +126,7 @@ public class AssociationClassRoleTargetEditPart extends LabelEditPart implements
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassRoleTargetEditPart.VISUAL_ID), new Point(0, 20));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassRoleTargetEditPart.VISUAL_ID), new Point(0, 20));

 	}

 

 	/**

@@ -343,7 +343,7 @@ public class AssociationClassRoleTargetEditPart extends LabelEditPart implements
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.AssociationClass_4017, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassRoleTargetEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.AssociationClass_4017, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassRoleTargetEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -591,7 +591,7 @@ public class AssociationClassRoleTargetEditPart extends LabelEditPart implements
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -735,7 +735,7 @@ public class AssociationClassRoleTargetEditPart extends LabelEditPart implements
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/role.gif";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/role.gif";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationEditPart.java
index a0182ea45c1..eba0b5ccf85 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gef.EditPart;

@@ -18,13 +18,13 @@ import org.eclipse.gef.EditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

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

-import org.eclipse.papyrus.diagram.clazz.custom.edit.part.AbstractAssociationEditPart;

-import org.eclipse.papyrus.diagram.clazz.custom.figure.AssociationFigure;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomAssociationItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.AssociationItemSemanticEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.AbstractAssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.AssociationFigure;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomAssociationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.AssociationItemSemanticEditPolicy;

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

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

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationMultiplicitySourceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationMultiplicitySourceEditPart.java
index 1088389d187..8608d72be5d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationMultiplicitySourceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationMultiplicitySourceEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,16 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.DisplayAssociationEndSourceMultiplicityEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,6 +59,16 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.DisplayAssociationEndSourceMultiplicityEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -126,7 +126,7 @@ public class AssociationMultiplicitySourceEditPart extends LabelEditPart impleme
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationMultiplicitySourceEditPart.VISUAL_ID), new Point(0, 20));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationMultiplicitySourceEditPart.VISUAL_ID), new Point(0, 20));

 	}

 

 	/**

@@ -343,7 +343,7 @@ public class AssociationMultiplicitySourceEditPart extends LabelEditPart impleme
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Association_4001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationMultiplicitySourceEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Association_4001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationMultiplicitySourceEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -591,7 +591,7 @@ public class AssociationMultiplicitySourceEditPart extends LabelEditPart impleme
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -735,7 +735,7 @@ public class AssociationMultiplicitySourceEditPart extends LabelEditPart impleme
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/MultiplicityHandler.gif";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/MultiplicityHandler.gif";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationMultiplicityTargetEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationMultiplicityTargetEditPart.java
index ea38dfc5f65..b6f8bdee6ef 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationMultiplicityTargetEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationMultiplicityTargetEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,16 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.DisplayAssociationEndTargetMultiplicityEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,6 +59,16 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.DisplayAssociationEndTargetMultiplicityEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -126,7 +126,7 @@ public class AssociationMultiplicityTargetEditPart extends LabelEditPart impleme
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationMultiplicityTargetEditPart.VISUAL_ID), new Point(0, -20));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationMultiplicityTargetEditPart.VISUAL_ID), new Point(0, -20));

 	}

 

 	/**

@@ -343,7 +343,7 @@ public class AssociationMultiplicityTargetEditPart extends LabelEditPart impleme
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Association_4001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationMultiplicityTargetEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Association_4001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationMultiplicityTargetEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -591,7 +591,7 @@ public class AssociationMultiplicityTargetEditPart extends LabelEditPart impleme
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -735,7 +735,7 @@ public class AssociationMultiplicityTargetEditPart extends LabelEditPart impleme
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/MultiplicityHandler.gif";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/MultiplicityHandler.gif";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationNameEditPart.java
index 783584051f1..66bc3311d56 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationNameEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,16 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

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

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

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

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -70,8 +60,18 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

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

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

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

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -129,7 +129,7 @@ public class AssociationNameEditPart extends LabelEditPart implements ITextAware
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationNameEditPart.VISUAL_ID), new Point(0, 20));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationNameEditPart.VISUAL_ID), new Point(0, 20));

 	}

 

 	/**

@@ -357,7 +357,7 @@ public class AssociationNameEditPart extends LabelEditPart implements ITextAware
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Association_4001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Association_4001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -605,7 +605,7 @@ public class AssociationNameEditPart extends LabelEditPart implements ITextAware
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -761,7 +761,7 @@ public class AssociationNameEditPart extends LabelEditPart implements ITextAware
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationNodeEditPart.java
index 9f3d39f8f7b..aca3f2dec50 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationNodeEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -43,14 +43,14 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomAssociationNodeItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.AssociationNodeItemSemanticEditPolicy;

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

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

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

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomAssociationNodeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.AssociationNodeItemSemanticEditPolicy;

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

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

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

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -242,7 +242,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof AssociationClassEditPart) {

 			types.add(UMLElementTypes.AssociationClass_4017);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationNodeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationNodeEditPart) {

 			types.add(UMLElementTypes.AssociationClass_4017);

 		}

 		if(targetEditPart instanceof ComponentEditPart) {

@@ -290,7 +290,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof AssociationClassEditPart) {

 			types.add(UMLElementTypes.Association_4001);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationNodeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationNodeEditPart) {

 			types.add(UMLElementTypes.Association_4001);

 		}

 		if(targetEditPart instanceof ComponentEditPart) {

@@ -338,7 +338,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof AssociationClassEditPart) {

 			types.add(UMLElementTypes.Association_4019);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationNodeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationNodeEditPart) {

 			types.add(UMLElementTypes.Association_4019);

 		}

 		if(targetEditPart instanceof ComponentEditPart) {

@@ -386,7 +386,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof AssociationClassEditPart) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationNodeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationNodeEditPart) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

 		if(targetEditPart instanceof ComponentEditPart) {

@@ -434,7 +434,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof AssociationClassEditPart) {

 			types.add(UMLElementTypes.Substitution_4004);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationNodeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationNodeEditPart) {

 			types.add(UMLElementTypes.Substitution_4004);

 		}

 		if(targetEditPart instanceof ComponentEditPart) {

@@ -485,7 +485,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof AssociationClassEditPart) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationNodeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationNodeEditPart) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

 		if(targetEditPart instanceof InstanceSpecificationEditPart) {

@@ -575,7 +575,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof AssociationClassEditPart) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationNodeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationNodeEditPart) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

 		if(targetEditPart instanceof InstanceSpecificationEditPart) {

@@ -665,7 +665,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof AssociationClassEditPart) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationNodeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationNodeEditPart) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

 		if(targetEditPart instanceof InstanceSpecificationEditPart) {

@@ -755,7 +755,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof AssociationClassEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationNodeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof InstanceSpecificationEditPart) {

@@ -845,7 +845,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof AssociationClassEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationNodeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof InstanceSpecificationEditPart) {

@@ -935,7 +935,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof AssociationClassEditPart) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationNodeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationNodeEditPart) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

 		if(targetEditPart instanceof InstanceSpecificationEditPart) {

@@ -1025,7 +1025,7 @@ ShapeNodeEditPart {
 		if(targetEditPart instanceof AssociationClassEditPart) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationNodeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationNodeEditPart) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

 		if(targetEditPart instanceof ComponentEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationSourceNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationSourceNameEditPart.java
index 3d9c6c98e2f..274e25a6b61 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationSourceNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationSourceNameEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,16 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.DisplayAssociationEndSourceEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,6 +59,16 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.DisplayAssociationEndSourceEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -126,7 +126,7 @@ public class AssociationSourceNameEditPart extends LabelEditPart implements ITex
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationSourceNameEditPart.VISUAL_ID), new Point(0, 20));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationSourceNameEditPart.VISUAL_ID), new Point(0, 20));

 	}

 

 	/**

@@ -343,7 +343,7 @@ public class AssociationSourceNameEditPart extends LabelEditPart implements ITex
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Association_4001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationSourceNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Association_4001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationSourceNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -591,7 +591,7 @@ public class AssociationSourceNameEditPart extends LabelEditPart implements ITex
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -735,7 +735,7 @@ public class AssociationSourceNameEditPart extends LabelEditPart implements ITex
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/role.gif";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/role.gif";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationTargetNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationTargetNameEditPart.java
index 940ca3687c0..8f710b7e352 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/AssociationTargetNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationTargetNameEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,16 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.DisplayAssociationEndTargetEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,6 +59,16 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.DisplayAssociationEndTargetEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -126,7 +126,7 @@ public class AssociationTargetNameEditPart extends LabelEditPart implements ITex
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationTargetNameEditPart.VISUAL_ID), new Point(0, -20));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationTargetNameEditPart.VISUAL_ID), new Point(0, -20));

 	}

 

 	/**

@@ -343,7 +343,7 @@ public class AssociationTargetNameEditPart extends LabelEditPart implements ITex
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Association_4001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationTargetNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Association_4001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationTargetNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -591,7 +591,7 @@ public class AssociationTargetNameEditPart extends LabelEditPart implements ITex
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -735,7 +735,7 @@ public class AssociationTargetNameEditPart extends LabelEditPart implements ITex
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/role.gif";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/role.gif";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/BindingSubstitutionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/BindingSubstitutionEditPart.java
index dd10f04462a..23bc4952a2d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/BindingSubstitutionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/BindingSubstitutionEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,17 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.custom.figure.BindingSubstitutionFigure;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.TemplateBindingDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -70,6 +59,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.BindingSubstitutionFigure;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.TemplateBindingDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

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

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

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

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -127,7 +127,7 @@ public class BindingSubstitutionEditPart extends LabelEditPart implements ITextA
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.BindingSubstitutionEditPart.VISUAL_ID), new Point(0, 40));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.BindingSubstitutionEditPart.VISUAL_ID), new Point(0, 40));

 	}

 

 	/**

@@ -344,7 +344,7 @@ public class BindingSubstitutionEditPart extends LabelEditPart implements ITextA
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.TemplateBinding_4015, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.BindingSubstitutionEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.TemplateBinding_4015, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.BindingSubstitutionEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -592,7 +592,7 @@ public class BindingSubstitutionEditPart extends LabelEditPart implements ITextA
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ClassAttributeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassAttributeCompartmentEditPart.java
index ff06ebc5c17..aeca78424cc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ClassAttributeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassAttributeCompartmentEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -25,12 +25,12 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

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

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

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.ClassAttributeCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

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

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassAttributeCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

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

 

 /**

  * @generated

@@ -79,7 +79,7 @@ extends ResizeableListCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.ClassAttributeCompartmentCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassAttributeCompartmentCanonicalEditPolicy());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ClassAttributeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassAttributeCompartmentEditPartCN.java
index 3f64228b176..d70ca903f2b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ClassAttributeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassAttributeCompartmentEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -25,12 +25,12 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

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

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

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.ClassAttributeCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

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

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassAttributeCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

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

 

 /**

  * @generated

@@ -79,7 +79,7 @@ extends ResizeableListCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.ClassAttributeCompartmentCanonicalEditPolicyCN());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassAttributeCompartmentCanonicalEditPolicyCN());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ClassEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassEditPart.java
index e0f68aa8404..fa0aa3050fa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ClassEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -47,31 +47,31 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.clazz.custom.locator.ContainmentPositionLocator;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomViewComponentEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomClassItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.ClassItemSemanticEditPolicy;

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

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

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

-import org.eclipse.papyrus.diagram.common.editparts.ClassifierEditPart;

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

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

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

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

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

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

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

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

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

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

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

-import org.eclipse.papyrus.diagram.common.locator.TemplateBorderItemLocator;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.locator.ContainmentPositionLocator;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomViewComponentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomClassItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassItemSemanticEditPolicy;

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

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

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

+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

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

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

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

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

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

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

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

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

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

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

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

+import org.eclipse.papyrus.uml.diagram.common.locator.TemplateBorderItemLocator;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -113,7 +113,7 @@ ClassifierEditPart {
 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.ClassCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassCanonicalEditPolicy());

 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

@@ -453,7 +453,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof EnumerationEditPart) {

 			types.add(UMLElementTypes.AssociationClass_4017);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ClassEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart) {

 			types.add(UMLElementTypes.AssociationClass_4017);

 		}

 		if(targetEditPart instanceof PrimitiveTypeEditPart) {

@@ -501,7 +501,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof EnumerationEditPart) {

 			types.add(UMLElementTypes.Association_4001);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ClassEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart) {

 			types.add(UMLElementTypes.Association_4001);

 		}

 		if(targetEditPart instanceof PrimitiveTypeEditPart) {

@@ -549,7 +549,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof EnumerationEditPart) {

 			types.add(UMLElementTypes.Association_4019);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ClassEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart) {

 			types.add(UMLElementTypes.Association_4019);

 		}

 		if(targetEditPart instanceof PrimitiveTypeEditPart) {

@@ -597,7 +597,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof EnumerationEditPart) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ClassEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

 		if(targetEditPart instanceof PrimitiveTypeEditPart) {

@@ -651,7 +651,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof EnumerationEditPart) {

 			types.add(UMLElementTypes.Substitution_4004);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ClassEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart) {

 			types.add(UMLElementTypes.Substitution_4004);

 		}

 		if(targetEditPart instanceof PrimitiveTypeEditPart) {

@@ -711,7 +711,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PackageEditPart) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ClassEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

 		if(targetEditPart instanceof PrimitiveTypeEditPart) {

@@ -801,7 +801,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PackageEditPart) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ClassEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

 		if(targetEditPart instanceof PrimitiveTypeEditPart) {

@@ -891,7 +891,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PackageEditPart) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ClassEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

 		if(targetEditPart instanceof PrimitiveTypeEditPart) {

@@ -981,7 +981,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PackageEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ClassEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof PrimitiveTypeEditPart) {

@@ -1071,7 +1071,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PackageEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ClassEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof PrimitiveTypeEditPart) {

@@ -1161,7 +1161,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PackageEditPart) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ClassEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

 		if(targetEditPart instanceof PrimitiveTypeEditPart) {

@@ -1248,7 +1248,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PackageEditPart) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ClassEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

 		if(targetEditPart instanceof PrimitiveTypeEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ClassEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassEditPartCN.java
index c875e25986c..89d2af25b35 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ClassEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -47,29 +47,29 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomClassItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.ClassItemSemanticEditPolicyCN;

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

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

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

-import org.eclipse.papyrus.diagram.common.editparts.ClassifierEditPart;

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

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

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

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

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

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

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

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

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

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

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

-import org.eclipse.papyrus.diagram.common.locator.TemplateBorderItemLocator;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomClassItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassItemSemanticEditPolicyCN;

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

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

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

+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

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

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

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

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

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

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

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

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

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

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

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

+import org.eclipse.papyrus.uml.diagram.common.locator.TemplateBorderItemLocator;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -111,7 +111,7 @@ ClassifierEditPart {
 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.ClassCanonicalEditPolicyCN());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassCanonicalEditPolicyCN());

 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

@@ -459,7 +459,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof EnumerationEditPartCN) {

 			types.add(UMLElementTypes.AssociationClass_4017);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ClassEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPartCN) {

 			types.add(UMLElementTypes.AssociationClass_4017);

 		}

 		if(targetEditPart instanceof PrimitiveTypeEditPartCN) {

@@ -507,7 +507,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof EnumerationEditPartCN) {

 			types.add(UMLElementTypes.Association_4001);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ClassEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPartCN) {

 			types.add(UMLElementTypes.Association_4001);

 		}

 		if(targetEditPart instanceof PrimitiveTypeEditPartCN) {

@@ -555,7 +555,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof EnumerationEditPartCN) {

 			types.add(UMLElementTypes.Association_4019);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ClassEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPartCN) {

 			types.add(UMLElementTypes.Association_4019);

 		}

 		if(targetEditPart instanceof PrimitiveTypeEditPartCN) {

@@ -603,7 +603,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof EnumerationEditPartCN) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ClassEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPartCN) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

 		if(targetEditPart instanceof PrimitiveTypeEditPartCN) {

@@ -657,7 +657,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof EnumerationEditPartCN) {

 			types.add(UMLElementTypes.Substitution_4004);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ClassEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPartCN) {

 			types.add(UMLElementTypes.Substitution_4004);

 		}

 		if(targetEditPart instanceof PrimitiveTypeEditPartCN) {

@@ -744,7 +744,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PackageEditPartCN) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ClassEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPartCN) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

 		if(targetEditPart instanceof PrimitiveTypeEditPartCN) {

@@ -834,7 +834,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PackageEditPartCN) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ClassEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPartCN) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

 		if(targetEditPart instanceof PrimitiveTypeEditPartCN) {

@@ -924,7 +924,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PackageEditPartCN) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ClassEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPartCN) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

 		if(targetEditPart instanceof PrimitiveTypeEditPartCN) {

@@ -1014,7 +1014,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PackageEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ClassEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof PrimitiveTypeEditPartCN) {

@@ -1104,7 +1104,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PackageEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ClassEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof PrimitiveTypeEditPartCN) {

@@ -1185,7 +1185,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PackageEditPartCN) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ClassEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPartCN) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

 		if(targetEditPart instanceof PrimitiveTypeEditPartCN) {

@@ -1260,7 +1260,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PackageEditPartCN) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ClassEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPartCN) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

 		if(targetEditPart instanceof PrimitiveTypeEditPartCN) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ClassNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassNameEditPart.java
index 61da890d346..5465f997d75 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ClassNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassNameEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

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

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

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

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,8 +59,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

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

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

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

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -339,7 +339,7 @@ public class ClassNameEditPart extends CompartmentEditPart implements ITextAware
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Class_2008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.ClassNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Class_2008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -587,7 +587,7 @@ public class ClassNameEditPart extends CompartmentEditPart implements ITextAware
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ClassNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassNameEditPartCN.java
index d438d0ee679..f7e8977e610 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ClassNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassNameEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

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

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

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

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,8 +59,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

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

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

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

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -339,7 +339,7 @@ public class ClassNameEditPartCN extends CompartmentEditPart implements ITextAwa
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Class_3010, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.ClassNameEditPartCN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Class_3010, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -587,7 +587,7 @@ public class ClassNameEditPartCN extends CompartmentEditPart implements ITextAwa
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ClassNestedClassifierCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassNestedClassifierCompartmentEditPart.java
index d76bb02099d..d18a0455210 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ClassNestedClassifierCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassNestedClassifierCompartmentEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -25,13 +25,13 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

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

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

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.NestedClazzCompartmentCreationEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.ClassNestedClassifierCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

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

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedClazzCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassNestedClassifierCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

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

 

 /**

  * @generated

@@ -80,7 +80,7 @@ extends ResizeableListCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.ClassNestedClassifierCompartmentCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassNestedClassifierCompartmentCanonicalEditPolicy());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ClassNestedClassifierCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassNestedClassifierCompartmentEditPartCN.java
index a07e8b24904..40a65311576 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ClassNestedClassifierCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassNestedClassifierCompartmentEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -25,13 +25,13 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

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

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

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.NestedClazzCompartmentCreationEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.ClassNestedClassifierCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

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

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedClazzCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassNestedClassifierCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

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

 

 /**

  * @generated

@@ -80,7 +80,7 @@ extends ResizeableListCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.ClassNestedClassifierCompartmentCanonicalEditPolicyCN());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassNestedClassifierCompartmentCanonicalEditPolicyCN());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ClassOperationCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassOperationCompartmentEditPart.java
index 20fb5990931..8952f5a1c84 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ClassOperationCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassOperationCompartmentEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -25,12 +25,12 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

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

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

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.ClassOperationCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

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

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassOperationCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

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

 

 /**

  * @generated

@@ -79,7 +79,7 @@ extends ResizeableListCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.ClassOperationCompartmentCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassOperationCompartmentCanonicalEditPolicy());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ClassOperationCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassOperationCompartmentEditPartCN.java
index a4546263eff..7fa0663d3b9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ClassOperationCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassOperationCompartmentEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -25,12 +25,12 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

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

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

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.ClassOperationCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

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

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassOperationCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

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

 

 /**

  * @generated

@@ -79,7 +79,7 @@ extends ResizeableListCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.ClassOperationCompartmentCanonicalEditPolicyCN());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassOperationCompartmentCanonicalEditPolicyCN());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ClassifierTemplateParameterEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassifierTemplateParameterEditPart.java
index a692601b32d..42437fed55b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ClassifierTemplateParameterEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassifierTemplateParameterEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -54,18 +54,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.custom.edit.part.AbstractTemplateParameterEditPart;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.TemplateParamaterDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.ClassifierTemplateParameterItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

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

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

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

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -75,6 +63,18 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.AbstractTemplateParameterEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.TemplateParamaterDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassifierTemplateParameterItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

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

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

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

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -348,7 +348,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.ClassifierTemplateParameter_3031, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.ClassifierTemplateParameterEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.ClassifierTemplateParameter_3031, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassifierTemplateParameterEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -596,7 +596,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/CommentAnnotatedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentAnnotatedElementEditPart.java
index 62f59ef4fdd..490227157c2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/CommentAnnotatedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentAnnotatedElementEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.draw2d.Graphics;

@@ -20,8 +20,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;

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

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.CommentAnnotatedElementItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.CommentAnnotatedElementItemSemanticEditPolicy;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/CommentBodyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentBodyEditPart.java
index e49e2a61f28..74fe77e64a5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/CommentBodyEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentBodyEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -49,15 +49,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

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

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

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

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

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -67,6 +58,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

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

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

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

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

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -324,7 +324,7 @@ public class CommentBodyEditPart extends CompartmentEditPart implements ITextAwa
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Comment_2012, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.CommentBodyEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Comment_2012, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentBodyEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -572,7 +572,7 @@ public class CommentBodyEditPart extends CompartmentEditPart implements ITextAwa
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/CommentBodyEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentBodyEditPartCN.java
index bdb36d16a77..9098f55a837 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/CommentBodyEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentBodyEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -49,15 +49,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

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

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

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

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

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -67,6 +58,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

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

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

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

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

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -324,7 +324,7 @@ public class CommentBodyEditPartCN extends CompartmentEditPart implements ITextA
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Comment_3028, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.CommentBodyEditPartCN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Comment_3028, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentBodyEditPartCN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -572,7 +572,7 @@ public class CommentBodyEditPartCN extends CompartmentEditPart implements ITextA
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/CommentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentEditPart.java
index 9bdd5aa692b..4ac5fcb91c6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/CommentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -38,20 +38,20 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.CommentItemSemanticEditPolicy;

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

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

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

-import org.eclipse.papyrus.diagram.common.editparts.AbstractCommentEditPart;

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

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

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

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

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

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.CommentItemSemanticEditPolicy;

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

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

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

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart;

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

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

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

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

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

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -342,7 +342,7 @@ AbstractCommentEditPart {
 		if(targetEditPart instanceof ConstraintEditPart) {

 			types.add(UMLElementTypes.CommentAnnotatedElement_4013);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.CommentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPart) {

 			types.add(UMLElementTypes.CommentAnnotatedElement_4013);

 		}

 		if(targetEditPart instanceof DurationObservationEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/CommentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentEditPartCN.java
index efed7bbdeff..c80834e39c6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/CommentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -38,20 +38,20 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.CommentItemSemanticEditPolicyCN;

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

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

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

-import org.eclipse.papyrus.diagram.common.editparts.AbstractCommentEditPart;

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

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

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

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

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

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.CommentItemSemanticEditPolicyCN;

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

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

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

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart;

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

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

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

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

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

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -393,7 +393,7 @@ AbstractCommentEditPart {
 		if(targetEditPart instanceof DataTypeEditPartCN) {

 			types.add(UMLElementTypes.CommentAnnotatedElement_4013);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.CommentEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPartCN) {

 			types.add(UMLElementTypes.CommentAnnotatedElement_4013);

 		}

 		if(targetEditPart instanceof ConstraintEditPartCN) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ComponentAttributeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentAttributeCompartmentEditPart.java
index f8e1204a92b..6c842dc3b7c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ComponentAttributeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentAttributeCompartmentEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -25,12 +25,12 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

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

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

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.ComponentAttributeCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

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

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentAttributeCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

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

 

 /**

  * @generated

@@ -79,7 +79,7 @@ extends ResizeableListCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.ComponentAttributeCompartmentCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentAttributeCompartmentCanonicalEditPolicy());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ComponentAttributeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentAttributeCompartmentEditPartCN.java
index c425e48383e..1cc4d208c83 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ComponentAttributeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentAttributeCompartmentEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -25,12 +25,12 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

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

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

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.ComponentAttributeCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

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

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentAttributeCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

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

 

 /**

  * @generated

@@ -79,7 +79,7 @@ extends ResizeableListCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.ComponentAttributeCompartmentCanonicalEditPolicyCN());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentAttributeCompartmentCanonicalEditPolicyCN());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPart.java
index cd3f6e5df47..a878796d694 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ComponentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -46,29 +46,29 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomComponentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.ComponentItemSemanticEditPolicy;

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

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

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

-import org.eclipse.papyrus.diagram.common.editparts.ClassifierEditPart;

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

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

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

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

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

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

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

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

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

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

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

-import org.eclipse.papyrus.diagram.common.locator.TemplateBorderItemLocator;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomComponentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentItemSemanticEditPolicy;

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

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

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

+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

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

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

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

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

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

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

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

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

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

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

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

+import org.eclipse.papyrus.uml.diagram.common.locator.TemplateBorderItemLocator;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -110,7 +110,7 @@ ClassifierEditPart {
 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.ComponentCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentCanonicalEditPolicy());

 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

@@ -418,7 +418,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof AssociationNodeEditPart) {

 			types.add(UMLElementTypes.AssociationClass_4017);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPart) {

 			types.add(UMLElementTypes.AssociationClass_4017);

 		}

 		if(targetEditPart instanceof SignalEditPart) {

@@ -466,7 +466,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof AssociationNodeEditPart) {

 			types.add(UMLElementTypes.Association_4001);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPart) {

 			types.add(UMLElementTypes.Association_4001);

 		}

 		if(targetEditPart instanceof SignalEditPart) {

@@ -514,7 +514,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof AssociationNodeEditPart) {

 			types.add(UMLElementTypes.Association_4019);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPart) {

 			types.add(UMLElementTypes.Association_4019);

 		}

 		if(targetEditPart instanceof SignalEditPart) {

@@ -562,7 +562,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof AssociationNodeEditPart) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPart) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

 		if(targetEditPart instanceof SignalEditPart) {

@@ -616,7 +616,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof AssociationNodeEditPart) {

 			types.add(UMLElementTypes.Substitution_4004);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPart) {

 			types.add(UMLElementTypes.Substitution_4004);

 		}

 		if(targetEditPart instanceof SignalEditPart) {

@@ -670,7 +670,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof InstanceSpecificationEditPart) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPart) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

 		if(targetEditPart instanceof SignalEditPart) {

@@ -760,7 +760,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof InstanceSpecificationEditPart) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPart) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

 		if(targetEditPart instanceof SignalEditPart) {

@@ -850,7 +850,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof InstanceSpecificationEditPart) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPart) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

 		if(targetEditPart instanceof SignalEditPart) {

@@ -940,7 +940,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof InstanceSpecificationEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof SignalEditPart) {

@@ -1030,7 +1030,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof InstanceSpecificationEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof SignalEditPart) {

@@ -1120,7 +1120,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof InstanceSpecificationEditPart) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPart) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

 		if(targetEditPart instanceof SignalEditPart) {

@@ -1207,7 +1207,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof AssociationNodeEditPart) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPart) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

 		if(targetEditPart instanceof SignalEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ComponentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPartCN.java
index c2df198b4b6..2ed546369e5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ComponentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -46,29 +46,29 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomComponentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.ComponentItemSemanticEditPolicyCN;

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

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

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

-import org.eclipse.papyrus.diagram.common.editparts.ClassifierEditPart;

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

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

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

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

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

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

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

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

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

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

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

-import org.eclipse.papyrus.diagram.common.locator.TemplateBorderItemLocator;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomComponentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentItemSemanticEditPolicyCN;

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

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

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

+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

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

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

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

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

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

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

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

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

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

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

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

+import org.eclipse.papyrus.uml.diagram.common.locator.TemplateBorderItemLocator;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -110,7 +110,7 @@ ClassifierEditPart {
 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.ComponentCanonicalEditPolicyCN());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentCanonicalEditPolicyCN());

 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

@@ -439,7 +439,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof DataTypeEditPart) {

 			types.add(UMLElementTypes.AssociationClass_4017);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPartCN) {

 			types.add(UMLElementTypes.AssociationClass_4017);

 		}

 		if(targetEditPart instanceof SignalEditPartCN) {

@@ -487,7 +487,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof DataTypeEditPart) {

 			types.add(UMLElementTypes.Association_4001);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPartCN) {

 			types.add(UMLElementTypes.Association_4001);

 		}

 		if(targetEditPart instanceof SignalEditPartCN) {

@@ -535,7 +535,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof DataTypeEditPart) {

 			types.add(UMLElementTypes.Association_4019);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPartCN) {

 			types.add(UMLElementTypes.Association_4019);

 		}

 		if(targetEditPart instanceof SignalEditPartCN) {

@@ -583,7 +583,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof DataTypeEditPart) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPartCN) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

 		if(targetEditPart instanceof SignalEditPartCN) {

@@ -637,7 +637,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof DataTypeEditPart) {

 			types.add(UMLElementTypes.Substitution_4004);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPartCN) {

 			types.add(UMLElementTypes.Substitution_4004);

 		}

 		if(targetEditPart instanceof SignalEditPartCN) {

@@ -718,7 +718,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof InstanceSpecificationEditPartCN) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPartCN) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

 		if(targetEditPart instanceof SignalEditPartCN) {

@@ -808,7 +808,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof InstanceSpecificationEditPartCN) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPartCN) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

 		if(targetEditPart instanceof SignalEditPartCN) {

@@ -898,7 +898,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof InstanceSpecificationEditPartCN) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPartCN) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

 		if(targetEditPart instanceof SignalEditPartCN) {

@@ -988,7 +988,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof InstanceSpecificationEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof SignalEditPartCN) {

@@ -1078,7 +1078,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof InstanceSpecificationEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof SignalEditPartCN) {

@@ -1159,7 +1159,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof InstanceSpecificationEditPartCN) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPartCN) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

 		if(targetEditPart instanceof SignalEditPartCN) {

@@ -1234,7 +1234,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof DataTypeEditPart) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPartCN) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

 		if(targetEditPart instanceof SignalEditPartCN) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ComponentNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentNameEditPart.java
index d51ea8a8206..d55823b31a0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ComponentNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentNameEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

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

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

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

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,8 +59,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

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

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

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

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -339,7 +339,7 @@ public class ComponentNameEditPart extends CompartmentEditPart implements ITextA
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Component_2002, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Component_2002, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -587,7 +587,7 @@ public class ComponentNameEditPart extends CompartmentEditPart implements ITextA
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ComponentNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentNameEditPartCN.java
index a2ac02b281b..126e9a44cad 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ComponentNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentNameEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

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

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

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

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,8 +59,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

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

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

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

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -339,7 +339,7 @@ public class ComponentNameEditPartCN extends CompartmentEditPart implements ITex
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Component_3021, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentNameEditPartCN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Component_3021, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -587,7 +587,7 @@ public class ComponentNameEditPartCN extends CompartmentEditPart implements ITex
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ComponentNestedClassifierCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentNestedClassifierCompartmentEditPart.java
index 6b3d8505359..0c7649336ad 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ComponentNestedClassifierCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentNestedClassifierCompartmentEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -25,13 +25,13 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

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

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

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.NestedClazzCompartmentCreationEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.ComponentNestedClassifierCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

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

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedClazzCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentNestedClassifierCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

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

 

 /**

  * @generated

@@ -80,7 +80,7 @@ extends ResizeableListCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.ComponentNestedClassifierCompartmentCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentNestedClassifierCompartmentCanonicalEditPolicy());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new NestedClazzCompartmentCreationEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ComponentNestedClassifierCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentNestedClassifierCompartmentEditPartCN.java
index ce11669a2fc..3910659ec65 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ComponentNestedClassifierCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentNestedClassifierCompartmentEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -25,13 +25,13 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

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

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

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.NestedClazzCompartmentCreationEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.ComponentNestedClassifierCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

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

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedClazzCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentNestedClassifierCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

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

 

 /**

  * @generated

@@ -80,7 +80,7 @@ extends ResizeableListCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.ComponentNestedClassifierCompartmentCanonicalEditPolicyCN());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentNestedClassifierCompartmentCanonicalEditPolicyCN());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ComponentOperationCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentOperationCompartmentEditPart.java
index bd0116a2906..6f9543f6ecb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ComponentOperationCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentOperationCompartmentEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -25,12 +25,12 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

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

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

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.ComponentOperationCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

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

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentOperationCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

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

 

 /**

  * @generated

@@ -79,7 +79,7 @@ extends ResizeableListCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.ComponentOperationCompartmentCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentOperationCompartmentCanonicalEditPolicy());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ComponentOperationCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentOperationCompartmentEditPartCN.java
index 44294f24ba8..8638959f555 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ComponentOperationCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentOperationCompartmentEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -25,12 +25,12 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

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

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

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.ComponentOperationCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

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

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentOperationCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

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

 

 /**

  * @generated

@@ -79,7 +79,7 @@ extends ResizeableListCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.ComponentOperationCompartmentCanonicalEditPolicyCN());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentOperationCompartmentCanonicalEditPolicyCN());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ConnectableElementTemplateParameterEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConnectableElementTemplateParameterEditPart.java
index f0ee6cede97..c62e98a56f3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ConnectableElementTemplateParameterEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConnectableElementTemplateParameterEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -55,17 +55,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.TemplateParamaterDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.ConnectableElementTemplateParameterItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

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

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

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

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -75,6 +64,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.TemplateParamaterDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ConnectableElementTemplateParameterItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

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

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

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

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -348,7 +348,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.ConnectableElementTemplateParameter_3034, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectableElementTemplateParameterEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.ConnectableElementTemplateParameter_3034, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectableElementTemplateParameterEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -596,7 +596,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ConnectorDurationObservationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConnectorDurationObservationEditPart.java
index 124542a8746..8c60e201000 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ConnectorDurationObservationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConnectorDurationObservationEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.draw2d.Graphics;

@@ -19,7 +19,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;

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

-import org.eclipse.papyrus.diagram.clazz.edit.policies.ConnectorDurationObservationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ConnectorDurationObservationItemSemanticEditPolicy;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ConnectorTimeObservationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConnectorTimeObservationEditPart.java
index 047e6198e46..814b5f89855 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ConnectorTimeObservationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConnectorTimeObservationEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.draw2d.Graphics;

@@ -19,7 +19,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;

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

-import org.eclipse.papyrus.diagram.clazz.edit.policies.ConnectorTimeObservationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ConnectorTimeObservationItemSemanticEditPolicy;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ConstraintBodyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintBodyEditPart.java
index be87dac35d9..9cd292b7b1c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ConstraintBodyEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintBodyEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -49,15 +49,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

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

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

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

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

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -67,6 +58,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

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

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

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

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

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -324,7 +324,7 @@ public class ConstraintBodyEditPart extends CompartmentEditPart implements IText
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_2011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintBodyEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_2011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintBodyEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -572,7 +572,7 @@ public class ConstraintBodyEditPart extends CompartmentEditPart implements IText
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ConstraintBodyEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintBodyEditPartCN.java
index 0651bc094ec..2cdfcc3a90e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ConstraintBodyEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintBodyEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -49,15 +49,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

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

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

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

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

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -67,6 +58,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

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

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

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

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

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -324,7 +324,7 @@ public class ConstraintBodyEditPartCN extends CompartmentEditPart implements ITe
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_3029, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintBodyEditPartCN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_3029, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintBodyEditPartCN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -572,7 +572,7 @@ public class ConstraintBodyEditPartCN extends CompartmentEditPart implements ITe
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ConstraintConstrainedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintConstrainedElementEditPart.java
index 7caef05a162..6e72fcbf674 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ConstraintConstrainedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintConstrainedElementEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.draw2d.Graphics;

@@ -20,8 +20,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;

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

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.ConstraintConstrainedElementItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ConstraintConstrainedElementItemSemanticEditPolicy;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintEditPart.java
index 96f2b345e6d..23ea0512995 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -38,21 +38,21 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomConstraintItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.ConstraintItemSemanticEditPolicy;

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

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

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

-import org.eclipse.papyrus.diagram.common.editparts.AbstractConstraintEditPart;

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

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

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

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

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

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomConstraintItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ConstraintItemSemanticEditPolicy;

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

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

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

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

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

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

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

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

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

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -353,7 +353,7 @@ AbstractConstraintEditPart {
 		if(targetEditPart instanceof DataTypeEditPart) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPart) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

 		if(targetEditPart instanceof DurationObservationEditPart) {

@@ -443,7 +443,7 @@ AbstractConstraintEditPart {
 		if(targetEditPart instanceof DataTypeEditPart) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPart) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

 		if(targetEditPart instanceof DurationObservationEditPart) {

@@ -533,7 +533,7 @@ AbstractConstraintEditPart {
 		if(targetEditPart instanceof DataTypeEditPart) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPart) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

 		if(targetEditPart instanceof DurationObservationEditPart) {

@@ -623,7 +623,7 @@ AbstractConstraintEditPart {
 		if(targetEditPart instanceof DataTypeEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof DurationObservationEditPart) {

@@ -713,7 +713,7 @@ AbstractConstraintEditPart {
 		if(targetEditPart instanceof DataTypeEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof DurationObservationEditPart) {

@@ -803,7 +803,7 @@ AbstractConstraintEditPart {
 		if(targetEditPart instanceof DataTypeEditPart) {

 			types.add(UMLElementTypes.ConstraintConstrainedElement_4014);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPart) {

 			types.add(UMLElementTypes.ConstraintConstrainedElement_4014);

 		}

 		if(targetEditPart instanceof CommentEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintEditPartCN.java
index 07514a43658..6d23ed1d84b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ConstraintEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -38,21 +38,21 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomConstraint2ItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.ConstraintItemSemanticEditPolicyCN;

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

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

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

-import org.eclipse.papyrus.diagram.common.editparts.AbstractConstraintEditPart;

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

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

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

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

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

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomConstraint2ItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ConstraintItemSemanticEditPolicyCN;

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

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

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

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

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

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

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

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

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

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -401,7 +401,7 @@ AbstractConstraintEditPart {
 		if(targetEditPart instanceof DataTypeEditPartCN) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPartCN) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

@@ -491,7 +491,7 @@ AbstractConstraintEditPart {
 		if(targetEditPart instanceof DataTypeEditPartCN) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPartCN) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

@@ -581,7 +581,7 @@ AbstractConstraintEditPart {
 		if(targetEditPart instanceof DataTypeEditPartCN) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPartCN) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

@@ -671,7 +671,7 @@ AbstractConstraintEditPart {
 		if(targetEditPart instanceof DataTypeEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

@@ -761,7 +761,7 @@ AbstractConstraintEditPart {
 		if(targetEditPart instanceof DataTypeEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

@@ -860,7 +860,7 @@ AbstractConstraintEditPart {
 		if(targetEditPart instanceof CommentEditPartCN) {

 			types.add(UMLElementTypes.ConstraintConstrainedElement_4014);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPartCN) {

 			types.add(UMLElementTypes.ConstraintConstrainedElement_4014);

 		}

 		return types;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ConstraintLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintLabelEditPart.java
index 4c21b29ab0b..edea1c0e97d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ConstraintLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintLabelEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,14 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

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

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

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

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -67,6 +59,14 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

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

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

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

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -124,7 +124,7 @@ public class ConstraintLabelEditPart extends LabelEditPart implements ITextAware
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintLabelEditPart.VISUAL_ID), new Point(0, 20));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintLabelEditPart.VISUAL_ID), new Point(0, 20));

 	}

 

 	/**

@@ -340,7 +340,7 @@ public class ConstraintLabelEditPart extends LabelEditPart implements ITextAware
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.GeneralizationSet_4020, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintLabelEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.GeneralizationSet_4020, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintLabelEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -588,7 +588,7 @@ public class ConstraintLabelEditPart extends LabelEditPart implements ITextAware
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ConstraintNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintNameEditPart.java
index 70e027d72c8..c2abb80c3c7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ConstraintNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintNameEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

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

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

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

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,8 +59,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

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

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

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

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -339,7 +339,7 @@ public class ConstraintNameEditPart extends CompartmentEditPart implements IText
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_2011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_2011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -587,7 +587,7 @@ public class ConstraintNameEditPart extends CompartmentEditPart implements IText
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ConstraintNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintNameEditPartCN.java
index e1a6c977e2b..d86bb4999aa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ConstraintNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintNameEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

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

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

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

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,8 +59,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

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

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

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

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -339,7 +339,7 @@ public class ConstraintNameEditPartCN extends CompartmentEditPart implements ITe
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_3029, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintNameEditPartCN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_3029, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -587,7 +587,7 @@ public class ConstraintNameEditPartCN extends CompartmentEditPart implements ITe
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ContainmentCircleEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContainmentCircleEditPart.java
index 67fd2c5f5ac..e59bda20817 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ContainmentCircleEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContainmentCircleEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.Shape;

@@ -33,12 +33,12 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.clazz.custom.figure.ContainmentFigure;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomContainmentCircleItemSemanticEditPolicy;

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

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

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.ContainmentFigure;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomContainmentCircleItemSemanticEditPolicy;

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

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

 import org.eclipse.swt.graphics.Color;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ContainmentLinkEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContainmentLinkEditPart.java
index 50ecb277973..4d561e4e1bc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ContainmentLinkEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContainmentLinkEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gef.EditPolicy;

@@ -19,8 +19,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ViewComponentEditPolicy;

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

-import org.eclipse.papyrus.diagram.clazz.custom.figure.AddedLinkFigure;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomViewComponentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.AddedLinkFigure;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomViewComponentEditPolicy;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ContainmentSubLinkEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContainmentSubLinkEditPart.java
index c27d0123b1c..9df1719f009 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ContainmentSubLinkEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContainmentSubLinkEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gef.EditPolicy;

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

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ViewComponentEditPolicy;

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

-import org.eclipse.papyrus.diagram.clazz.custom.figure.AddedLinkFigure;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomViewComponentEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomContainmentSubLinkItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.AddedLinkFigure;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomViewComponentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomContainmentSubLinkItemSemanticEditPolicy;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/DataTypeAttributeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeAttributeCompartmentEditPart.java
index b910401df11..29ae24b71d3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/DataTypeAttributeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeAttributeCompartmentEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -25,12 +25,12 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

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

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

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.DataTypeAttributeCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

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

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DataTypeAttributeCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

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

 

 /**

  * @generated

@@ -79,7 +79,7 @@ extends ResizeableListCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.DataTypeAttributeCompartmentCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DataTypeAttributeCompartmentCanonicalEditPolicy());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/DataTypeAttributeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeAttributeCompartmentEditPartCN.java
index be142f3b5b3..4704602d108 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/DataTypeAttributeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeAttributeCompartmentEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -25,12 +25,12 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

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

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

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.DataTypeAttributeCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

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

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DataTypeAttributeCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

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

 

 /**

  * @generated

@@ -79,7 +79,7 @@ extends ResizeableListCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.DataTypeAttributeCompartmentCanonicalEditPolicyCN());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DataTypeAttributeCompartmentCanonicalEditPolicyCN());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/DataTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeEditPart.java
index 591f07851d7..32dde4f951b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/DataTypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -46,29 +46,29 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomDataTypeItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.DataTypeItemSemanticEditPolicy;

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

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

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

-import org.eclipse.papyrus.diagram.common.editparts.ClassifierEditPart;

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

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

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

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

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

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

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

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

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

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

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

-import org.eclipse.papyrus.diagram.common.locator.TemplateBorderItemLocator;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomDataTypeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DataTypeItemSemanticEditPolicy;

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

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

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

+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

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

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

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

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

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

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

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

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

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

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

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

+import org.eclipse.papyrus.uml.diagram.common.locator.TemplateBorderItemLocator;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -110,7 +110,7 @@ ClassifierEditPart {
 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.DataTypeCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DataTypeCanonicalEditPolicy());

 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.POPUPBAR_ROLE, new HyperLinkPopupBarEditPolicy());

@@ -419,7 +419,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PrimitiveTypeEditPart) {

 			types.add(UMLElementTypes.AssociationClass_4017);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPart) {

 			types.add(UMLElementTypes.AssociationClass_4017);

 		}

 		if(targetEditPart instanceof ComponentEditPartCN) {

@@ -467,7 +467,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PrimitiveTypeEditPart) {

 			types.add(UMLElementTypes.Association_4001);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPart) {

 			types.add(UMLElementTypes.Association_4001);

 		}

 		if(targetEditPart instanceof ComponentEditPartCN) {

@@ -515,7 +515,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PrimitiveTypeEditPart) {

 			types.add(UMLElementTypes.Association_4019);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPart) {

 			types.add(UMLElementTypes.Association_4019);

 		}

 		if(targetEditPart instanceof ComponentEditPartCN) {

@@ -563,7 +563,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PrimitiveTypeEditPart) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPart) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

 		if(targetEditPart instanceof ComponentEditPartCN) {

@@ -611,7 +611,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PrimitiveTypeEditPart) {

 			types.add(UMLElementTypes.Substitution_4004);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPart) {

 			types.add(UMLElementTypes.Substitution_4004);

 		}

 		if(targetEditPart instanceof ComponentEditPartCN) {

@@ -671,7 +671,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PrimitiveTypeEditPart) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPart) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

 		if(targetEditPart instanceof ConstraintEditPart) {

@@ -761,7 +761,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PrimitiveTypeEditPart) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPart) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

 		if(targetEditPart instanceof ConstraintEditPart) {

@@ -851,7 +851,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PrimitiveTypeEditPart) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPart) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

 		if(targetEditPart instanceof ConstraintEditPart) {

@@ -941,7 +941,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PrimitiveTypeEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof ConstraintEditPart) {

@@ -1031,7 +1031,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PrimitiveTypeEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof ConstraintEditPart) {

@@ -1121,7 +1121,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PrimitiveTypeEditPart) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPart) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

 		if(targetEditPart instanceof ConstraintEditPart) {

@@ -1208,7 +1208,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PrimitiveTypeEditPart) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPart) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

 		if(targetEditPart instanceof ComponentEditPartCN) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/DataTypeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeEditPartCN.java
index be3793b98df..4605233dc99 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/DataTypeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -46,29 +46,29 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomDataTypeItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.DataTypeItemSemanticEditPolicyCN;

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

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

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

-import org.eclipse.papyrus.diagram.common.editparts.ClassifierEditPart;

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

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

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

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

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

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

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

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

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

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

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

-import org.eclipse.papyrus.diagram.common.locator.TemplateBorderItemLocator;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomDataTypeItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DataTypeItemSemanticEditPolicyCN;

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

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

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

+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

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

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

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

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

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

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

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

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

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

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

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

+import org.eclipse.papyrus.uml.diagram.common.locator.TemplateBorderItemLocator;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -110,7 +110,7 @@ ClassifierEditPart {
 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.DataTypeCanonicalEditPolicyCN());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DataTypeCanonicalEditPolicyCN());

 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.POPUPBAR_ROLE, new HyperLinkPopupBarEditPolicy());

@@ -440,7 +440,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PrimitiveTypeEditPartCN) {

 			types.add(UMLElementTypes.AssociationClass_4017);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPartCN) {

 			types.add(UMLElementTypes.AssociationClass_4017);

 		}

 		if(targetEditPart instanceof AssociationClassEditPart) {

@@ -488,7 +488,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PrimitiveTypeEditPartCN) {

 			types.add(UMLElementTypes.Association_4001);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPartCN) {

 			types.add(UMLElementTypes.Association_4001);

 		}

 		if(targetEditPart instanceof AssociationClassEditPart) {

@@ -536,7 +536,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PrimitiveTypeEditPartCN) {

 			types.add(UMLElementTypes.Association_4019);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPartCN) {

 			types.add(UMLElementTypes.Association_4019);

 		}

 		if(targetEditPart instanceof AssociationClassEditPart) {

@@ -584,7 +584,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PrimitiveTypeEditPartCN) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPartCN) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

 		if(targetEditPart instanceof AssociationClassEditPart) {

@@ -632,7 +632,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PrimitiveTypeEditPartCN) {

 			types.add(UMLElementTypes.Substitution_4004);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPartCN) {

 			types.add(UMLElementTypes.Substitution_4004);

 		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

@@ -719,7 +719,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PrimitiveTypeEditPartCN) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPartCN) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

 		if(targetEditPart instanceof ConstraintEditPartCN) {

@@ -809,7 +809,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PrimitiveTypeEditPartCN) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPartCN) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

 		if(targetEditPart instanceof ConstraintEditPartCN) {

@@ -899,7 +899,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PrimitiveTypeEditPartCN) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPartCN) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

 		if(targetEditPart instanceof ConstraintEditPartCN) {

@@ -989,7 +989,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PrimitiveTypeEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof ConstraintEditPartCN) {

@@ -1079,7 +1079,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PrimitiveTypeEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof ConstraintEditPartCN) {

@@ -1160,7 +1160,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PrimitiveTypeEditPartCN) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPartCN) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

 		if(targetEditPart instanceof ConstraintEditPartCN) {

@@ -1235,7 +1235,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof PrimitiveTypeEditPartCN) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPartCN) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

 		return types;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/DataTypeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeNameEditPart.java
index 5b9fb8eaa13..a831773ccac 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/DataTypeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeNameEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

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

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

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

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,8 +59,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

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

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

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

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -339,7 +339,7 @@ public class DataTypeNameEditPart extends CompartmentEditPart implements ITextAw
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.DataType_2010, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.DataType_2010, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -587,7 +587,7 @@ public class DataTypeNameEditPart extends CompartmentEditPart implements ITextAw
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/DataTypeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeNameEditPartCN.java
index 75430a3fa91..e03c12c0b95 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/DataTypeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeNameEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

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

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

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

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,8 +59,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

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

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

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

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

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

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

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -339,7 +339,7 @@ public class DataTypeNameEditPartCN extends CompartmentEditPart implements IText
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.DataType_3027, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeNameEditPartCN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.DataType_3027, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -587,7 +587,7 @@ public class DataTypeNameEditPartCN extends CompartmentEditPart implements IText
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/DataTypeOperationCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeOperationCompartmentEditPart.java
index 7a39e5b8daf..2560f332b06 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/DataTypeOperationCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeOperationCompartmentEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -25,12 +25,12 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.DataTypeOperationCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DataTypeOperationCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

 

 /**

  * @generated

@@ -79,7 +79,7 @@ extends ResizeableListCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.DataTypeOperationCompartmentCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DataTypeOperationCompartmentCanonicalEditPolicy());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/DataTypeOperationCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeOperationCompartmentEditPartCN.java
index 726a27bb526..9fd298e108b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/DataTypeOperationCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeOperationCompartmentEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -25,12 +25,12 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.DataTypeOperationCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DataTypeOperationCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

 

 /**

  * @generated

@@ -79,7 +79,7 @@ extends ResizeableListCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.DataTypeOperationCompartmentCanonicalEditPolicyCN());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DataTypeOperationCompartmentCanonicalEditPolicyCN());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/DefaultNamedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DefaultNamedElementEditPart.java
index c2db17d5f80..9a49ae0f91b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/DefaultNamedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DefaultNamedElementEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -39,23 +39,23 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomDefaultNamedElementItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.DefaultNamedElementItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.common.editparts.NamedElementEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.NodeNamedElementFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomDefaultNamedElementItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DefaultNamedElementItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -359,7 +359,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof TimeObservationEditPart) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DefaultNamedElementEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DefaultNamedElementEditPart) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

 		if(targetEditPart instanceof ShapeNamedElementEditPart) {

@@ -449,7 +449,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof TimeObservationEditPart) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DefaultNamedElementEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DefaultNamedElementEditPart) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

 		if(targetEditPart instanceof ShapeNamedElementEditPart) {

@@ -539,7 +539,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof TimeObservationEditPart) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DefaultNamedElementEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DefaultNamedElementEditPart) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

 		if(targetEditPart instanceof ShapeNamedElementEditPart) {

@@ -629,7 +629,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof TimeObservationEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DefaultNamedElementEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DefaultNamedElementEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof ShapeNamedElementEditPart) {

@@ -719,7 +719,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof TimeObservationEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DefaultNamedElementEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DefaultNamedElementEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof ShapeNamedElementEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/DefaultNamedElementNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DefaultNamedElementNameEditPart.java
index 14aa6c786ae..1f9b8a6c027 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/DefaultNamedElementNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DefaultNamedElementNameEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,8 +59,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -339,7 +339,7 @@ public class DefaultNamedElementNameEditPart extends CompartmentEditPart impleme
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.NamedElement_2097, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.DefaultNamedElementNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.NamedElement_2097, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DefaultNamedElementNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -587,7 +587,7 @@ public class DefaultNamedElementNameEditPart extends CompartmentEditPart impleme
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/DependencyBranchEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyBranchEditPart.java
index f9ef8a0f977..66aca6542f3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/DependencyBranchEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyBranchEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gef.EditPolicy;

@@ -18,9 +18,9 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.DependencyBranchSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.edge.DashedEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DependencyBranchSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/DependencyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyEditPart.java
index 20ff7e5ab92..e981d06933a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/DependencyEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gef.EditPart;

@@ -18,12 +18,12 @@ import org.eclipse.gef.EditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.DependencyItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.edge.DashedEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DependencyItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/DependencyNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyNameEditPart.java
index 8ca1bf489ee..d0780a0eed9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/DependencyNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyNameEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +59,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -125,7 +125,7 @@ public class DependencyNameEditPart extends LabelEditPart implements ITextAwareE
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyNameEditPart.VISUAL_ID), new Point(0, 40));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyNameEditPart.VISUAL_ID), new Point(0, 40));

 	}

 

 	/**

@@ -341,7 +341,7 @@ public class DependencyNameEditPart extends LabelEditPart implements ITextAwareE
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_4008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_4008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -589,7 +589,7 @@ public class DependencyNameEditPart extends LabelEditPart implements ITextAwareE
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -741,7 +741,7 @@ public class DependencyNameEditPart extends LabelEditPart implements ITextAwareE
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/DependencyNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyNodeEditPart.java
index a3862c6fe22..5283a5289b7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/DependencyNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyNodeEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.ArrayList;

 import java.util.Collections;

@@ -48,15 +48,15 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.DependencyNodeItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DependencyNodeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -269,7 +269,7 @@ AbstractBorderedShapeEditPart {
 	 */

 	public List<IElementType> getMARelTypesOnSourceAndTarget(IGraphicalEditPart targetEditPart) {

 		LinkedList<IElementType> types = new LinkedList<IElementType>();

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyNodeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

 		if(targetEditPart instanceof AssociationClassEditPart) {

@@ -359,7 +359,7 @@ AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof ConstraintEditPartCN) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyNodeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

 		if(targetEditPart instanceof AssociationClassEditPart) {

@@ -449,7 +449,7 @@ AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof ConstraintEditPartCN) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyNodeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

 		if(targetEditPart instanceof AssociationClassEditPart) {

@@ -539,7 +539,7 @@ AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof ConstraintEditPartCN) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyNodeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof AssociationClassEditPart) {

@@ -629,7 +629,7 @@ AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof ConstraintEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyNodeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof AssociationClassEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/DiagramNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DiagramNameEditPart.java
index df2125dea4c..8cfcb6f5702 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/DiagramNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DiagramNameEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,16 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.AbstractShortcutDiagramNameEditPart;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -70,6 +60,16 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractShortcutDiagramNameEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -131,7 +131,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.DiagramNameEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DiagramNameEditPart.VISUAL_ID), new Point(0, 0));

 	}

 

 	/**

@@ -362,7 +362,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Diagram_2016, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.DiagramNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Diagram_2016, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DiagramNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -610,7 +610,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -769,7 +769,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/DurationObservationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DurationObservationEditPart.java
index 2b3a8cc743a..3621c8e83a4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/DurationObservationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DurationObservationEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.ArrayList;

 import java.util.Collections;

@@ -45,25 +45,25 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.clazz.custom.edit.part.AbstractObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.custom.figure.DurationObservationNodeFigure;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ObservationLayoutEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomDurationObservationItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.DurationObservationItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.common.locator.ExternalLabelPositionLocator;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.AbstractObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.DurationObservationNodeFigure;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ObservationLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomDurationObservationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DurationObservationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -350,7 +350,7 @@ AbstractObservationEditPart {
 		if(targetEditPart instanceof ConstraintEditPart) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DurationObservationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DurationObservationEditPart) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

 		if(targetEditPart instanceof TimeObservationEditPart) {

@@ -440,7 +440,7 @@ AbstractObservationEditPart {
 		if(targetEditPart instanceof ConstraintEditPart) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DurationObservationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DurationObservationEditPart) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

 		if(targetEditPart instanceof TimeObservationEditPart) {

@@ -530,7 +530,7 @@ AbstractObservationEditPart {
 		if(targetEditPart instanceof ConstraintEditPart) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DurationObservationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DurationObservationEditPart) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

 		if(targetEditPart instanceof TimeObservationEditPart) {

@@ -620,7 +620,7 @@ AbstractObservationEditPart {
 		if(targetEditPart instanceof ConstraintEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DurationObservationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DurationObservationEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof TimeObservationEditPart) {

@@ -710,7 +710,7 @@ AbstractObservationEditPart {
 		if(targetEditPart instanceof ConstraintEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DurationObservationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DurationObservationEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof TimeObservationEditPart) {

@@ -800,7 +800,7 @@ AbstractObservationEditPart {
 		if(targetEditPart instanceof ConstraintEditPart) {

 			types.add(UMLElementTypes.DurationObservationEvent_4025);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.DurationObservationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DurationObservationEditPart) {

 			types.add(UMLElementTypes.DurationObservationEvent_4025);

 		}

 		if(targetEditPart instanceof TimeObservationEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/DurationObservationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DurationObservationNameEditPart.java
index 467d375052e..bf16c926aae 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/DurationObservationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DurationObservationNameEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -52,15 +52,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -70,6 +61,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -131,7 +131,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.DurationObservationNameEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DurationObservationNameEditPart.VISUAL_ID), new Point(0, 0));

 	}

 

 	/**

@@ -362,7 +362,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.DurationObservation_2095, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.DurationObservationNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.DurationObservation_2095, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DurationObservationNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -610,7 +610,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -769,7 +769,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/DurationObservationStereotypeLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DurationObservationStereotypeLabelEditPart.java
index 196be151ea9..6f514328016 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/DurationObservationStereotypeLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DurationObservationStereotypeLabelEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,19 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.AbstractLabelEditPart;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -73,6 +60,19 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -134,7 +134,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.DurationObservationStereotypeLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DurationObservationStereotypeLabelEditPart.VISUAL_ID), new Point(0, 0));

 	}

 

 	/**

@@ -366,7 +366,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.DurationObservation_2095, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.DurationObservationStereotypeLabelEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.DurationObservation_2095, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DurationObservationStereotypeLabelEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -614,7 +614,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ElementImportAliasEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ElementImportAliasEditPart.java
index 1518bba80ec..89c34ce3a07 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ElementImportAliasEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ElementImportAliasEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +59,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -125,7 +125,7 @@ public class ElementImportAliasEditPart extends LabelEditPart implements ITextAw
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportAliasEditPart.VISUAL_ID), new Point(0, 40));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportAliasEditPart.VISUAL_ID), new Point(0, 40));

 	}

 

 	/**

@@ -341,7 +341,7 @@ public class ElementImportAliasEditPart extends LabelEditPart implements ITextAw
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.ElementImport_4009, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportAliasEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.ElementImport_4009, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportAliasEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -589,7 +589,7 @@ public class ElementImportAliasEditPart extends LabelEditPart implements ITextAw
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -741,7 +741,7 @@ public class ElementImportAliasEditPart extends LabelEditPart implements ITextAw
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/alias.png";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/alias.png";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ElementImportEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ElementImportEditPart.java
index 47a2425fdf3..aad6fdcb0bf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ElementImportEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ElementImportEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gef.EditPart;

@@ -18,12 +18,12 @@ import org.eclipse.gef.EditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.AppliedStereotypeElementImportLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.ElementImportItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.edge.DashedEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeElementImportLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ElementImportItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/EnumerationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEditPart.java
index ce6677287bd..abe3d73b7fe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/EnumerationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -42,25 +42,25 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomEnumerationItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.EnumerationItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.common.editparts.ClassifierEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.EnumerationFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomEnumerationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.EnumerationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.EnumerationFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -358,7 +358,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof InterfaceEditPart) {

 			types.add(UMLElementTypes.AssociationClass_4017);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPart) {

 			types.add(UMLElementTypes.AssociationClass_4017);

 		}

 		if(targetEditPart instanceof ClassEditPart) {

@@ -406,7 +406,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof InterfaceEditPart) {

 			types.add(UMLElementTypes.Association_4001);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPart) {

 			types.add(UMLElementTypes.Association_4001);

 		}

 		if(targetEditPart instanceof ClassEditPart) {

@@ -454,7 +454,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof InterfaceEditPart) {

 			types.add(UMLElementTypes.Association_4019);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPart) {

 			types.add(UMLElementTypes.Association_4019);

 		}

 		if(targetEditPart instanceof ClassEditPart) {

@@ -502,7 +502,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof InterfaceEditPart) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPart) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

 		if(targetEditPart instanceof ClassEditPart) {

@@ -550,7 +550,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof InterfaceEditPart) {

 			types.add(UMLElementTypes.Substitution_4004);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPart) {

 			types.add(UMLElementTypes.Substitution_4004);

 		}

 		if(targetEditPart instanceof ClassEditPart) {

@@ -607,7 +607,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ModelEditPartTN) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPart) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

 		if(targetEditPart instanceof PackageEditPart) {

@@ -697,7 +697,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ModelEditPartTN) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPart) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

 		if(targetEditPart instanceof PackageEditPart) {

@@ -787,7 +787,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ModelEditPartTN) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPart) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

 		if(targetEditPart instanceof PackageEditPart) {

@@ -877,7 +877,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ModelEditPartTN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof PackageEditPart) {

@@ -967,7 +967,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ModelEditPartTN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof PackageEditPart) {

@@ -1057,7 +1057,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ModelEditPartTN) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPart) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

 		if(targetEditPart instanceof PackageEditPart) {

@@ -1144,7 +1144,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ModelEditPartTN) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPart) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

 		if(targetEditPart instanceof PackageEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/EnumerationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEditPartCN.java
index cfed0d34cc8..30df976731a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/EnumerationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -42,25 +42,25 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomEnumerationItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.EnumerationItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.common.editparts.ClassifierEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.EnumerationFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomEnumerationItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.EnumerationItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.EnumerationFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -379,7 +379,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof InterfaceEditPartCN) {

 			types.add(UMLElementTypes.AssociationClass_4017);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPartCN) {

 			types.add(UMLElementTypes.AssociationClass_4017);

 		}

 		if(targetEditPart instanceof ClassEditPartCN) {

@@ -427,7 +427,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof InterfaceEditPartCN) {

 			types.add(UMLElementTypes.Association_4001);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPartCN) {

 			types.add(UMLElementTypes.Association_4001);

 		}

 		if(targetEditPart instanceof ClassEditPartCN) {

@@ -475,7 +475,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof InterfaceEditPartCN) {

 			types.add(UMLElementTypes.Association_4019);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPartCN) {

 			types.add(UMLElementTypes.Association_4019);

 		}

 		if(targetEditPart instanceof ClassEditPartCN) {

@@ -523,7 +523,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof InterfaceEditPartCN) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPartCN) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

 		if(targetEditPart instanceof ClassEditPartCN) {

@@ -571,7 +571,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof InterfaceEditPartCN) {

 			types.add(UMLElementTypes.Substitution_4004);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPartCN) {

 			types.add(UMLElementTypes.Substitution_4004);

 		}

 		if(targetEditPart instanceof ClassEditPartCN) {

@@ -655,7 +655,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ModelEditPartCN) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPartCN) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

 		if(targetEditPart instanceof PackageEditPartCN) {

@@ -745,7 +745,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ModelEditPartCN) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPartCN) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

 		if(targetEditPart instanceof PackageEditPartCN) {

@@ -835,7 +835,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ModelEditPartCN) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPartCN) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

 		if(targetEditPart instanceof PackageEditPartCN) {

@@ -925,7 +925,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ModelEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof PackageEditPartCN) {

@@ -1015,7 +1015,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ModelEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof PackageEditPartCN) {

@@ -1096,7 +1096,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ModelEditPartCN) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPartCN) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

 		if(targetEditPart instanceof PackageEditPartCN) {

@@ -1171,7 +1171,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ModelEditPartCN) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPartCN) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

 		if(targetEditPart instanceof PackageEditPartCN) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java
index e3255970af6..72cfe548195 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -26,11 +26,11 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

 

 /**

  * @generated

@@ -79,7 +79,7 @@ extends ListCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.EnumerationEnumerationLiteralCompartmentCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.EnumerationEnumerationLiteralCompartmentCanonicalEditPolicy());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java
index a0b441e3089..f7bec99a158 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -26,11 +26,11 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

 

 /**

  * @generated

@@ -79,7 +79,7 @@ extends ListCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.EnumerationEnumerationLiteralCompartmentCanonicalEditPolicyCN());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.EnumerationEnumerationLiteralCompartmentCanonicalEditPolicyCN());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/EnumerationLiteralEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationLiteralEditPart.java
index a2bb17b971a..cf2f60b49fb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/EnumerationLiteralEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationLiteralEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -55,18 +55,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.EnumerationLiteralItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -76,8 +64,20 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.EnumerationLiteralItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -364,7 +364,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.EnumerationLiteral_3017, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationLiteralEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.EnumerationLiteral_3017, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationLiteralEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -612,7 +612,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/EnumerationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationNameEditPart.java
index f8ebb6c5b33..af02c6f4ffa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/EnumerationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationNameEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,8 +59,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -339,7 +339,7 @@ public class EnumerationNameEditPart extends CompartmentEditPart implements ITex
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Enumeration_2006, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Enumeration_2006, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -587,7 +587,7 @@ public class EnumerationNameEditPart extends CompartmentEditPart implements ITex
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/EnumerationNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationNameEditPartCN.java
index aa2008cd019..267958b557d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/EnumerationNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationNameEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,8 +59,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -339,7 +339,7 @@ public class EnumerationNameEditPartCN extends CompartmentEditPart implements IT
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Enumeration_3025, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationNameEditPartCN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Enumeration_3025, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -587,7 +587,7 @@ public class EnumerationNameEditPartCN extends CompartmentEditPart implements IT
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/GeneralizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/GeneralizationEditPart.java
index 5828cd6171e..d27f56faab6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/GeneralizationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/GeneralizationEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gef.EditPart;

@@ -18,13 +18,13 @@ import org.eclipse.gef.EditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomGeneralizationItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.GeneralizationItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.edge.GeneralizationFigure;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomGeneralizationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.GeneralizationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.GeneralizationFigure;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/GeneralizationSetEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/GeneralizationSetEditPart.java
index c168e2b214f..891aa0ced47 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/GeneralizationSetEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/GeneralizationSetEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gef.EditPart;

@@ -18,13 +18,13 @@ import org.eclipse.gef.EditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.custom.figure.GeneralizationSet;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.GeneralizationSetLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.GeneralizationSetItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.GeneralizationSet;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.GeneralizationSetLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.GeneralizationSetItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InstanceSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationEditPart.java
index 58ec7050cf3..85cbb815c88 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InstanceSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -41,23 +41,23 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomInstanceSpecificationItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.InstanceSpecificationItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.common.editparts.NamedElementEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.InstanceSpecificationFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomInstanceSpecificationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InstanceSpecificationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.InstanceSpecificationFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -339,7 +339,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof AssociationNodeEditPart) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.InstanceSpecificationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPart) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

 		if(targetEditPart instanceof ComponentEditPart) {

@@ -429,7 +429,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof AssociationNodeEditPart) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.InstanceSpecificationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPart) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

 		if(targetEditPart instanceof ComponentEditPart) {

@@ -519,7 +519,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof AssociationNodeEditPart) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.InstanceSpecificationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPart) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

 		if(targetEditPart instanceof ComponentEditPart) {

@@ -609,7 +609,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof AssociationNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.InstanceSpecificationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof ComponentEditPart) {

@@ -699,7 +699,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof AssociationNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.InstanceSpecificationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof ComponentEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InstanceSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationEditPartCN.java
index fd140a1f230..3fe47ebd3f5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InstanceSpecificationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -41,23 +41,23 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomInstanceSpecificationItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.InstanceSpecificationItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.common.editparts.NamedElementEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.InstanceSpecificationFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomInstanceSpecificationItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InstanceSpecificationItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.InstanceSpecificationFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -387,7 +387,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof RedefinableTemplateSignatureEditPart) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.InstanceSpecificationEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPartCN) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

 		if(targetEditPart instanceof ComponentEditPartCN) {

@@ -477,7 +477,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof RedefinableTemplateSignatureEditPart) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.InstanceSpecificationEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPartCN) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

 		if(targetEditPart instanceof ComponentEditPartCN) {

@@ -567,7 +567,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof RedefinableTemplateSignatureEditPart) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.InstanceSpecificationEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPartCN) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

 		if(targetEditPart instanceof ComponentEditPartCN) {

@@ -657,7 +657,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof RedefinableTemplateSignatureEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.InstanceSpecificationEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof ComponentEditPartCN) {

@@ -747,7 +747,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof RedefinableTemplateSignatureEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.InstanceSpecificationEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof ComponentEditPartCN) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InstanceSpecificationLinkEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationLinkEditPart.java
index aa6f607c9a9..de83bcb6190 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InstanceSpecificationLinkEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationLinkEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gef.EditPart;

@@ -19,9 +19,9 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.custom.figure.InstanceSpecificationLinkFigure;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.InstanceSpecificationLinkItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.InstanceSpecificationLinkFigure;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InstanceSpecificationLinkItemSemanticEditPolicy;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InstanceSpecificationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationNameEditPart.java
index 9435ab777b8..8d366c0f07c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InstanceSpecificationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationNameEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,16 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.InstanceSpecificationNameLabelEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -69,8 +59,18 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.InstanceSpecificationNameLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -341,7 +341,7 @@ public class InstanceSpecificationNameEditPart extends CompartmentEditPart imple
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.InstanceSpecification_2001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.InstanceSpecificationNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.InstanceSpecification_2001, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -589,7 +589,7 @@ public class InstanceSpecificationNameEditPart extends CompartmentEditPart imple
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InstanceSpecificationNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationNameEditPartCN.java
index 60f26640df1..63e2777688b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InstanceSpecificationNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationNameEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -49,15 +49,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.InstanceSpecificationNameLabelEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -67,6 +58,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.InstanceSpecificationNameLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -325,7 +325,7 @@ public class InstanceSpecificationNameEditPartCN extends CompartmentEditPart imp
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.InstanceSpecification_3020, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.InstanceSpecificationNameEditPartCN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.InstanceSpecification_3020, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -573,7 +573,7 @@ public class InstanceSpecificationNameEditPartCN extends CompartmentEditPart imp
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InstanceSpecificationSlotCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationSlotCompartmentEditPart.java
index 60728489629..a6358f33850 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InstanceSpecificationSlotCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationSlotCompartmentEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -26,11 +26,11 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.InstanceSpecificationSlotCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InstanceSpecificationSlotCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

 

 /**

  * @generated

@@ -79,7 +79,7 @@ extends ListCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.InstanceSpecificationSlotCompartmentCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InstanceSpecificationSlotCompartmentCanonicalEditPolicy());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InstanceSpecificationSlotCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationSlotCompartmentEditPartCN.java
index cb135d25839..3c343292aee 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InstanceSpecificationSlotCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationSlotCompartmentEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -26,11 +26,11 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.InstanceSpecificationSlotCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InstanceSpecificationSlotCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

 

 /**

  * @generated

@@ -79,7 +79,7 @@ extends ListCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.InstanceSpecificationSlotCompartmentCanonicalEditPolicyCN());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InstanceSpecificationSlotCompartmentCanonicalEditPolicyCN());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InterfaceAttributeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceAttributeCompartmentEditPart.java
index e8b550f1205..6eae2974d16 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InterfaceAttributeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceAttributeCompartmentEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -25,12 +25,12 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.InterfaceAttributeCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceAttributeCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

 

 /**

  * @generated

@@ -79,7 +79,7 @@ extends ResizeableListCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.InterfaceAttributeCompartmentCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceAttributeCompartmentCanonicalEditPolicy());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InterfaceAttributeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceAttributeCompartmentEditPartCN.java
index 4d1b7d7ba32..3db38b83464 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InterfaceAttributeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceAttributeCompartmentEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -25,12 +25,12 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.InterfaceAttributeCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceAttributeCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

 

 /**

  * @generated

@@ -79,7 +79,7 @@ extends ResizeableListCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.InterfaceAttributeCompartmentCanonicalEditPolicyCN());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceAttributeCompartmentCanonicalEditPolicyCN());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPart.java
index 270fc918c15..2591bc376ed 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InterfaceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -46,27 +46,27 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomInterfaceItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.InterfaceItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.common.editparts.ClassifierEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.BorderItemResizableEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.InterfaceFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.common.locator.TemplateBorderItemLocator;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomInterfaceItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.InterfaceFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.common.locator.TemplateBorderItemLocator;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -108,7 +108,7 @@ ClassifierEditPart {
 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.InterfaceCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceCanonicalEditPolicy());

 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.POPUPBAR_ROLE, new HyperLinkPopupBarEditPolicy());

@@ -419,7 +419,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof SignalEditPart) {

 			types.add(UMLElementTypes.AssociationClass_4017);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPart) {

 			types.add(UMLElementTypes.AssociationClass_4017);

 		}

 		if(targetEditPart instanceof EnumerationEditPart) {

@@ -467,7 +467,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof SignalEditPart) {

 			types.add(UMLElementTypes.Association_4001);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPart) {

 			types.add(UMLElementTypes.Association_4001);

 		}

 		if(targetEditPart instanceof EnumerationEditPart) {

@@ -515,7 +515,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof SignalEditPart) {

 			types.add(UMLElementTypes.Association_4019);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPart) {

 			types.add(UMLElementTypes.Association_4019);

 		}

 		if(targetEditPart instanceof EnumerationEditPart) {

@@ -563,7 +563,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof SignalEditPart) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPart) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

 		if(targetEditPart instanceof EnumerationEditPart) {

@@ -611,7 +611,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof SignalEditPart) {

 			types.add(UMLElementTypes.Substitution_4004);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPart) {

 			types.add(UMLElementTypes.Substitution_4004);

 		}

 		if(targetEditPart instanceof EnumerationEditPart) {

@@ -665,7 +665,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof SignalEditPart) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPart) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

 		if(targetEditPart instanceof ModelEditPartTN) {

@@ -755,7 +755,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof SignalEditPart) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPart) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

 		if(targetEditPart instanceof ModelEditPartTN) {

@@ -845,7 +845,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof SignalEditPart) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPart) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

 		if(targetEditPart instanceof ModelEditPartTN) {

@@ -935,7 +935,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof SignalEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof ModelEditPartTN) {

@@ -1025,7 +1025,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof SignalEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof ModelEditPartTN) {

@@ -1115,7 +1115,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof SignalEditPart) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPart) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

 		if(targetEditPart instanceof ModelEditPartTN) {

@@ -1202,7 +1202,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof SignalEditPart) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPart) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

 		if(targetEditPart instanceof ModelEditPartTN) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InterfaceEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPartCN.java
index a55da8d99e3..852b1e2b412 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InterfaceEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -46,28 +46,28 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomInterfaceItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.InterfaceItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.common.editparts.ClassifierEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.BorderItemResizableEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.InterfaceFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.common.locator.TemplateBorderItemLocator;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomInterfaceItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.InterfaceFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.common.locator.TemplateBorderItemLocator;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -109,7 +109,7 @@ ClassifierEditPart {
 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.InterfaceCanonicalEditPolicyCN());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceCanonicalEditPolicyCN());

 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.POPUPBAR_ROLE, new HyperLinkPopupBarEditPolicy());

@@ -442,7 +442,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof SignalEditPartCN) {

 			types.add(UMLElementTypes.AssociationClass_4017);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPartCN) {

 			types.add(UMLElementTypes.AssociationClass_4017);

 		}

 		if(targetEditPart instanceof EnumerationEditPartCN) {

@@ -490,7 +490,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof SignalEditPartCN) {

 			types.add(UMLElementTypes.Association_4001);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPartCN) {

 			types.add(UMLElementTypes.Association_4001);

 		}

 		if(targetEditPart instanceof EnumerationEditPartCN) {

@@ -538,7 +538,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof SignalEditPartCN) {

 			types.add(UMLElementTypes.Association_4019);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPartCN) {

 			types.add(UMLElementTypes.Association_4019);

 		}

 		if(targetEditPart instanceof EnumerationEditPartCN) {

@@ -586,7 +586,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof SignalEditPartCN) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPartCN) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

 		if(targetEditPart instanceof EnumerationEditPartCN) {

@@ -634,7 +634,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof SignalEditPartCN) {

 			types.add(UMLElementTypes.Substitution_4004);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPartCN) {

 			types.add(UMLElementTypes.Substitution_4004);

 		}

 		if(targetEditPart instanceof EnumerationEditPartCN) {

@@ -715,7 +715,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof SignalEditPartCN) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPartCN) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

 		if(targetEditPart instanceof ModelEditPartCN) {

@@ -805,7 +805,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof SignalEditPartCN) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPartCN) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

 		if(targetEditPart instanceof ModelEditPartCN) {

@@ -895,7 +895,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof SignalEditPartCN) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPartCN) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

 		if(targetEditPart instanceof ModelEditPartCN) {

@@ -985,7 +985,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof SignalEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof ModelEditPartCN) {

@@ -1075,7 +1075,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof SignalEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof ModelEditPartCN) {

@@ -1156,7 +1156,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof SignalEditPartCN) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPartCN) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

 		if(targetEditPart instanceof ModelEditPartCN) {

@@ -1231,7 +1231,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof SignalEditPartCN) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPartCN) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

 		if(targetEditPart instanceof ModelEditPartCN) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InterfaceNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceNameEditPart.java
index d084ab820c2..e6de16818d5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InterfaceNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceNameEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,8 +59,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -339,7 +339,7 @@ public class InterfaceNameEditPart extends CompartmentEditPart implements ITextA
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Interface_2004, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Interface_2004, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -587,7 +587,7 @@ public class InterfaceNameEditPart extends CompartmentEditPart implements ITextA
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InterfaceNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceNameEditPartCN.java
index 543af3d52b2..e4d7abfdeb1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InterfaceNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceNameEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,8 +59,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -339,7 +339,7 @@ public class InterfaceNameEditPartCN extends CompartmentEditPart implements ITex
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Interface_3023, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceNameEditPartCN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Interface_3023, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -587,7 +587,7 @@ public class InterfaceNameEditPartCN extends CompartmentEditPart implements ITex
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InterfaceNestedClassifierCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceNestedClassifierCompartmentEditPart.java
index 29a0f7489c8..1b63db7b0a8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InterfaceNestedClassifierCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceNestedClassifierCompartmentEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -25,13 +25,13 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.NestedClazzCompartmentCreationEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.InterfaceNestedClassifierCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedClazzCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceNestedClassifierCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

 

 /**

  * @generated

@@ -80,7 +80,7 @@ extends ResizeableListCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.InterfaceNestedClassifierCompartmentCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceNestedClassifierCompartmentCanonicalEditPolicy());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InterfaceNestedClassifierCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceNestedClassifierCompartmentEditPartCN.java
index 69baea47782..77b15163eaf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InterfaceNestedClassifierCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceNestedClassifierCompartmentEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -25,13 +25,13 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.NestedClazzCompartmentCreationEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.InterfaceNestedClassifierCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedClazzCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceNestedClassifierCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

 

 /**

  * @generated

@@ -80,7 +80,7 @@ extends ResizeableListCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.InterfaceNestedClassifierCompartmentCanonicalEditPolicyCN());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceNestedClassifierCompartmentCanonicalEditPolicyCN());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InterfaceOperationCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceOperationCompartmentEditPart.java
index d9b0b5bd63c..610168aed11 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InterfaceOperationCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceOperationCompartmentEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -25,12 +25,12 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.InterfaceOperationCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceOperationCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

 

 /**

  * @generated

@@ -79,7 +79,7 @@ extends ResizeableListCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.InterfaceOperationCompartmentCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceOperationCompartmentCanonicalEditPolicy());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InterfaceOperationCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceOperationCompartmentEditPartCN.java
index 3468db5b1f6..fd4ee5b67d8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InterfaceOperationCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceOperationCompartmentEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -25,12 +25,12 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.InterfaceOperationCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceOperationCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

 

 /**

  * @generated

@@ -79,7 +79,7 @@ extends ResizeableListCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.InterfaceOperationCompartmentCanonicalEditPolicyCN());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceOperationCompartmentCanonicalEditPolicyCN());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InterfaceRealizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceRealizationEditPart.java
index 101b91c8c11..60427b657dc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InterfaceRealizationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceRealizationEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gef.EditPart;

@@ -18,13 +18,13 @@ import org.eclipse.gef.EditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomInterfaceRealizationItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.InterfaceRealizationItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.edge.InterfaceRealizationFigure;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomInterfaceRealizationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceRealizationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InterfaceRealizationName2EditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceRealizationName2EditPart.java
index 4e7061eba8a..702aab19c19 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/InterfaceRealizationName2EditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceRealizationName2EditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +59,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -125,7 +125,7 @@ public class InterfaceRealizationName2EditPart extends LabelEditPart implements
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceRealizationName2EditPart.VISUAL_ID), new Point(0, 60));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceRealizationName2EditPart.VISUAL_ID), new Point(0, 60));

 	}

 

 	/**

@@ -341,7 +341,7 @@ public class InterfaceRealizationName2EditPart extends LabelEditPart implements
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.InterfaceRealization_4003, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceRealizationName2EditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.InterfaceRealization_4003, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceRealizationName2EditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -589,7 +589,7 @@ public class InterfaceRealizationName2EditPart extends LabelEditPart implements
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -741,7 +741,7 @@ public class InterfaceRealizationName2EditPart extends LabelEditPart implements
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ModelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPart.java
index 4b75cd4650c..5de279c22f5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ModelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -27,13 +27,13 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.NonResizableLabelEditPolicy;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.ModelItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

-import org.eclipse.papyrus.diagram.common.providers.ViewInfo;

-import org.eclipse.papyrus.diagram.common.util.MDTUtil;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.providers.ViewInfo;

+import org.eclipse.papyrus.uml.diagram.common.util.MDTUtil;

 

 /**

  * @generated

@@ -67,7 +67,7 @@ public class ModelEditPart extends DiagramEditPart {
 		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ModelItemSemanticEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.ModelCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelCanonicalEditPolicy());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ModelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPartCN.java
index bda36b85b0f..26db1ca95db 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ModelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -43,28 +43,28 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomModelItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.ModelItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.common.editparts.NamedElementEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.BorderItemResizableEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.PackageFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.common.locator.TemplateBorderItemLocator;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomModelItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.common.locator.TemplateBorderItemLocator;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -106,7 +106,7 @@ NamedElementEditPart {
 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.ModelCanonicalEditPolicyCN());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelCanonicalEditPolicyCN());

 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

@@ -451,7 +451,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartCN) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartCN) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

 		if(targetEditPart instanceof EnumerationEditPartCN) {

@@ -541,7 +541,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartCN) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartCN) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

 		if(targetEditPart instanceof EnumerationEditPartCN) {

@@ -631,7 +631,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartCN) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartCN) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

 		if(targetEditPart instanceof EnumerationEditPartCN) {

@@ -721,7 +721,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof EnumerationEditPartCN) {

@@ -811,7 +811,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof EnumerationEditPartCN) {

@@ -892,7 +892,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartCN) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartCN) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

 		if(targetEditPart instanceof EnumerationEditPartCN) {

@@ -919,7 +919,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof PackageEditPart) {

 			types.add(UMLElementTypes.PackageImport_4010);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartCN) {

 			types.add(UMLElementTypes.PackageImport_4010);

 		}

 		if(targetEditPart instanceof PackageEditPartCN) {

@@ -931,7 +931,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof PackageEditPart) {

 			types.add(UMLElementTypes.PackageMerge_4011);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartCN) {

 			types.add(UMLElementTypes.PackageMerge_4011);

 		}

 		if(targetEditPart instanceof PackageEditPartCN) {

@@ -979,7 +979,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartCN) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartCN) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

 		if(targetEditPart instanceof EnumerationEditPartCN) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ModelEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPartTN.java
index e59ff8d5765..2246dfbca9e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ModelEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPartTN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -43,28 +43,28 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomModelItemSemanticEditPolicyTN;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.ModelItemSemanticEditPolicyTN;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.common.editparts.NamedElementEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.BorderItemResizableEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.PackageFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.common.locator.TemplateBorderItemLocator;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomModelItemSemanticEditPolicyTN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelItemSemanticEditPolicyTN;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.common.locator.TemplateBorderItemLocator;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -106,7 +106,7 @@ NamedElementEditPart {
 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.ModelCanonicalEditPolicyTN());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelCanonicalEditPolicyTN());

 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

@@ -403,7 +403,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPart) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartTN) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

 		if(targetEditPart instanceof EnumerationEditPart) {

@@ -493,7 +493,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPart) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartTN) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

 		if(targetEditPart instanceof EnumerationEditPart) {

@@ -583,7 +583,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPart) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartTN) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

 		if(targetEditPart instanceof EnumerationEditPart) {

@@ -673,7 +673,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartTN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof EnumerationEditPart) {

@@ -763,7 +763,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartTN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof EnumerationEditPart) {

@@ -853,7 +853,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPart) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartTN) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

 		if(targetEditPart instanceof EnumerationEditPart) {

@@ -913,7 +913,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof ConstraintEditPartCN) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartTN) {

 			types.add(UMLElementTypes.PackageImport_4010);

 		}

 		if(targetEditPart instanceof PackageEditPart) {

@@ -925,7 +925,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof PackageEditPartCN) {

 			types.add(UMLElementTypes.PackageImport_4010);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartTN) {

 			types.add(UMLElementTypes.PackageMerge_4011);

 		}

 		if(targetEditPart instanceof PackageEditPart) {

@@ -952,7 +952,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPart) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPartTN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartTN) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

 		if(targetEditPart instanceof EnumerationEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ModelNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelNameEditPartCN.java
index 2f30a823565..18ac300e4c0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ModelNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelNameEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,8 +59,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -339,7 +339,7 @@ public class ModelNameEditPartCN extends CompartmentEditPart implements ITextAwa
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Model_3024, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.ModelNameEditPartCN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Model_3024, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -587,7 +587,7 @@ public class ModelNameEditPartCN extends CompartmentEditPart implements ITextAwa
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ModelNameEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelNameEditPartTN.java
index 52864fa7a06..3a6980d921f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ModelNameEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelNameEditPartTN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,8 +59,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -339,7 +339,7 @@ public class ModelNameEditPartTN extends CompartmentEditPart implements ITextAwa
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Model_2005, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.ModelNameEditPartTN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Model_2005, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelNameEditPartTN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -587,7 +587,7 @@ public class ModelNameEditPartTN extends CompartmentEditPart implements ITextAwa
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ModelPackageableElementCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelPackageableElementCompartmentEditPartCN.java
index c9dd6a109c7..b24de4d0cec 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ModelPackageableElementCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelPackageableElementCompartmentEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -24,14 +24,14 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.AbstractPackageableElementCompartmentEditPart;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomContainmentCreationEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.ModelPackageableElementCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AbstractPackageableElementCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomContainmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelPackageableElementCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

 

 /**

  * @generated

@@ -72,7 +72,7 @@ extends AbstractPackageableElementCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.ModelPackageableElementCompartmentCanonicalEditPolicyCN());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelPackageableElementCompartmentCanonicalEditPolicyCN());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ModelPackageableElementCompartmentEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelPackageableElementCompartmentEditPartTN.java
index 4f1da2daefa..bf99a14ff81 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ModelPackageableElementCompartmentEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelPackageableElementCompartmentEditPartTN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -24,14 +24,14 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.AbstractPackageableElementCompartmentEditPart;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomContainmentCreationEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.ModelPackageableElementCompartmentItemSemanticEditPolicyTN;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AbstractPackageableElementCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomContainmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelPackageableElementCompartmentItemSemanticEditPolicyTN;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

 

 /**

  * @generated

@@ -72,7 +72,7 @@ extends AbstractPackageableElementCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.ModelPackageableElementCompartmentCanonicalEditPolicyTN());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelPackageableElementCompartmentCanonicalEditPolicyTN());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/MultiDependencyLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/MultiDependencyLabelEditPart.java
index 593aff8bfef..300c8017d1c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/MultiDependencyLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/MultiDependencyLabelEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -52,15 +52,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -70,6 +61,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -131,7 +131,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.MultiDependencyLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.MultiDependencyLabelEditPart.VISUAL_ID), new Point(0, 0));

 	}

 

 	/**

@@ -366,7 +366,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_2014, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.MultiDependencyLabelEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_2014, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.MultiDependencyLabelEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -621,7 +621,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -782,7 +782,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/NestedClassForClassEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedClassForClassEditPart.java
index f71e617f3b9..a2150001d70 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/NestedClassForClassEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedClassForClassEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -55,19 +55,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.NestedClassForClassItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -77,8 +64,21 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.NestedClassForClassItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -364,7 +364,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Class_3014, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.NestedClassForClassEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Class_3014, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForClassEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -612,7 +612,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/NestedClassForComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedClassForComponentEditPart.java
index fc32dcd1c56..1482361b46d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/NestedClassForComponentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedClassForComponentEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -55,18 +55,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.NestedClassForComponentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -76,8 +64,20 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.NestedClassForComponentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -362,7 +362,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Class_3004, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.NestedClassForComponentEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Class_3004, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForComponentEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -610,7 +610,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/NestedClassForInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedClassForInterfaceEditPart.java
index b33ac3a35ea..11233531e20 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/NestedClassForInterfaceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedClassForInterfaceEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -55,18 +55,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.NestedClassForInterfaceItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -76,8 +64,20 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.NestedClassForInterfaceItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -362,7 +362,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Class_3008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.NestedClassForInterfaceEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Class_3008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForInterfaceEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -610,7 +610,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/OperationForClassEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForClassEditPart.java
index 60716ed8fee..4095d0383b8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/OperationForClassEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForClassEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -54,20 +54,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.AppliedStereotypeOperationDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.OperationLabelEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.OperationForClassItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -77,6 +63,20 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeOperationDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.OperationLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.OperationForClassItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -353,7 +353,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Operation_3013, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.OperationForClassEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Operation_3013, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForClassEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -601,7 +601,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/OperationForComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForComponentEditPart.java
index 28eab1ebebd..8b843004532 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/OperationForComponentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForComponentEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -54,20 +54,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.AppliedStereotypeOperationDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.OperationLabelEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.OperationItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -77,6 +63,20 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeOperationDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.OperationLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.OperationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -353,7 +353,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Operation_3003, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.OperationForComponentEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Operation_3003, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForComponentEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -601,7 +601,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/OperationForDataTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForDataTypeEditPart.java
index 76741c742d4..fc39f11582d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/OperationForDataTypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForDataTypeEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -54,20 +54,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.AppliedStereotypeOperationDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.OperationLabelEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.OperationForDataTypeItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -77,6 +63,20 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeOperationDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.OperationLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.OperationForDataTypeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -353,7 +353,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Operation_3019, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.OperationForDataTypeEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Operation_3019, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForDataTypeEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -601,7 +601,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/OperationForInterfaceEditpart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForInterfaceEditpart.java
index 54e75f85817..1e577cac876 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/OperationForInterfaceEditpart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForInterfaceEditpart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -54,20 +54,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.AppliedStereotypeOperationDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.OperationLabelEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.OperationForInterfaceItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -77,6 +63,20 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeOperationDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.OperationLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.OperationForInterfaceItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -353,7 +353,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Operation_3007, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.OperationForInterfaceEditpart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Operation_3007, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForInterfaceEditpart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -601,7 +601,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/OperationTemplateParameterEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationTemplateParameterEditPart.java
index aaf4c779973..e6920cd58a0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/OperationTemplateParameterEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationTemplateParameterEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -55,18 +55,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.OperationTemplateParamaterDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.TemplateParamaterDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.OperationTemplateParameterItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -76,6 +64,18 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.OperationTemplateParamaterDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.TemplateParamaterDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.OperationTemplateParameterItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -349,7 +349,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.OperationTemplateParameter_3035, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.OperationTemplateParameterEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.OperationTemplateParameter_3035, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationTemplateParameterEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -597,7 +597,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageEditPart.java
index a6bbd9f315c..e57f96942f2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PackageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -43,29 +43,29 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomViewComponentEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomPackageItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.PackageItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.common.editparts.NamedElementEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.BorderItemResizableEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.PackageFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.common.locator.TemplateBorderItemLocator;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomViewComponentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomPackageItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PackageItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.common.locator.TemplateBorderItemLocator;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -107,7 +107,7 @@ NamedElementEditPart {
 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.PackageCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PackageCanonicalEditPolicy());

 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

@@ -411,7 +411,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof EnumerationEditPart) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPart) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

 		if(targetEditPart instanceof ClassEditPart) {

@@ -501,7 +501,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof EnumerationEditPart) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPart) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

 		if(targetEditPart instanceof ClassEditPart) {

@@ -591,7 +591,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof EnumerationEditPart) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPart) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

 		if(targetEditPart instanceof ClassEditPart) {

@@ -681,7 +681,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof EnumerationEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof ClassEditPart) {

@@ -771,7 +771,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof EnumerationEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof ClassEditPart) {

@@ -861,7 +861,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof EnumerationEditPart) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPart) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

 		if(targetEditPart instanceof ClassEditPart) {

@@ -918,7 +918,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof ModelEditPartTN) {

 			types.add(UMLElementTypes.PackageImport_4010);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPart) {

 			types.add(UMLElementTypes.PackageImport_4010);

 		}

 		if(targetEditPart instanceof ModelEditPartCN) {

@@ -930,7 +930,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof ModelEditPartTN) {

 			types.add(UMLElementTypes.PackageMerge_4011);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPart) {

 			types.add(UMLElementTypes.PackageMerge_4011);

 		}

 		if(targetEditPart instanceof ModelEditPartCN) {

@@ -960,7 +960,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof EnumerationEditPart) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PackageEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPart) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

 		if(targetEditPart instanceof ClassEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PackageEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageEditPartCN.java
index cced44ccc90..c21b860362b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PackageEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -43,27 +43,27 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.PackageItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.common.editparts.NamedElementEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.BorderItemResizableEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.PackageFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.common.locator.TemplateBorderItemLocator;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PackageItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.common.locator.TemplateBorderItemLocator;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -105,7 +105,7 @@ NamedElementEditPart {
 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.PackageCanonicalEditPolicyCN());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PackageCanonicalEditPolicyCN());

 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$

@@ -455,7 +455,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof EnumerationEditPartCN) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PackageEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPartCN) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

 		if(targetEditPart instanceof ClassEditPartCN) {

@@ -545,7 +545,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof EnumerationEditPartCN) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PackageEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPartCN) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

 		if(targetEditPart instanceof ClassEditPartCN) {

@@ -635,7 +635,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof EnumerationEditPartCN) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PackageEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPartCN) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

 		if(targetEditPart instanceof ClassEditPartCN) {

@@ -725,7 +725,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof EnumerationEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PackageEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof ClassEditPartCN) {

@@ -815,7 +815,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof EnumerationEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PackageEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof ClassEditPartCN) {

@@ -896,7 +896,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof EnumerationEditPartCN) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PackageEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPartCN) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

 		if(targetEditPart instanceof ClassEditPartCN) {

@@ -920,7 +920,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof ModelEditPartCN) {

 			types.add(UMLElementTypes.PackageImport_4010);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PackageEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPartCN) {

 			types.add(UMLElementTypes.PackageImport_4010);

 		}

 		if(targetEditPart instanceof ModelEditPartTN) {

@@ -932,7 +932,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof ModelEditPartCN) {

 			types.add(UMLElementTypes.PackageMerge_4011);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PackageEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPartCN) {

 			types.add(UMLElementTypes.PackageMerge_4011);

 		}

 		if(targetEditPart instanceof AssociationClassEditPart) {

@@ -983,7 +983,7 @@ NamedElementEditPart {
 		if(targetEditPart instanceof EnumerationEditPartCN) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PackageEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPartCN) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

 		if(targetEditPart instanceof ClassEditPartCN) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PackageImportEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageImportEditPart.java
index 81983ca06e9..91b88089898 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PackageImportEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageImportEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gef.EditPart;

@@ -18,12 +18,12 @@ import org.eclipse.gef.EditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.PackageImportItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypePackageImportLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.edge.DashedEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PackageImportItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypePackageImportLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PackageMergeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageMergeEditPart.java
index 996b14239dc..5f96144621e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PackageMergeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageMergeEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gef.EditPart;

@@ -18,12 +18,12 @@ import org.eclipse.gef.EditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.PackageMergeItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypePackageMergeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.edge.DashedEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PackageMergeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypePackageMergeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PackageNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageNameEditPart.java
index 2c74439f4b8..10ed3928ea7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PackageNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageNameEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,8 +59,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -339,7 +339,7 @@ public class PackageNameEditPart extends CompartmentEditPart implements ITextAwa
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Package_2007, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.PackageNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Package_2007, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -587,7 +587,7 @@ public class PackageNameEditPart extends CompartmentEditPart implements ITextAwa
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PackageNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageNameEditPartCN.java
index 65a6d60e715..a29e616df58 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PackageNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageNameEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,8 +59,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -339,7 +339,7 @@ public class PackageNameEditPartCN extends CompartmentEditPart implements ITextA
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Package_3009, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.PackageNameEditPartCN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Package_3009, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -587,7 +587,7 @@ public class PackageNameEditPartCN extends CompartmentEditPart implements ITextA
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PackagePackageableElementCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackagePackageableElementCompartmentEditPart.java
index 9d40fce86a3..06f78dd9af6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PackagePackageableElementCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackagePackageableElementCompartmentEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -24,14 +24,14 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.AbstractPackageableElementCompartmentEditPart;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomContainmentCreationEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.PackagePackageableElementCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AbstractPackageableElementCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomContainmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PackagePackageableElementCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

 

 /**

  * @generated

@@ -72,7 +72,7 @@ extends AbstractPackageableElementCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.PackagePackageableElementCompartmentCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PackagePackageableElementCompartmentCanonicalEditPolicy());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PackagePackageableElementCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackagePackageableElementCompartmentEditPartCN.java
index d9eeb2e89a2..48e68b1300f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PackagePackageableElementCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackagePackageableElementCompartmentEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -24,14 +24,14 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.AbstractPackageableElementCompartmentEditPart;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomContainmentCreationEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.PackagePackageableElementCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.common.editpolicies.CustomContainerEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AbstractPackageableElementCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomContainmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PackagePackageableElementCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

 

 /**

  * @generated

@@ -72,7 +72,7 @@ extends AbstractPackageableElementCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.PackagePackageableElementCompartmentCanonicalEditPolicyCN());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PackagePackageableElementCompartmentCanonicalEditPolicyCN());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PrimitiveTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeEditPart.java
index 6e2570ab3e4..9d63f25afc7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PrimitiveTypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -39,23 +39,23 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomPrimitiveTypeItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.PrimitiveTypeItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.common.editparts.ClassifierEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.PrimitiveTypeFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomPrimitiveTypeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PrimitiveTypeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PrimitiveTypeFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -340,7 +340,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ClassEditPart) {

 			types.add(UMLElementTypes.AssociationClass_4017);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPart) {

 			types.add(UMLElementTypes.AssociationClass_4017);

 		}

 		if(targetEditPart instanceof DataTypeEditPart) {

@@ -388,7 +388,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ClassEditPart) {

 			types.add(UMLElementTypes.Association_4001);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPart) {

 			types.add(UMLElementTypes.Association_4001);

 		}

 		if(targetEditPart instanceof DataTypeEditPart) {

@@ -436,7 +436,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ClassEditPart) {

 			types.add(UMLElementTypes.Association_4019);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPart) {

 			types.add(UMLElementTypes.Association_4019);

 		}

 		if(targetEditPart instanceof DataTypeEditPart) {

@@ -484,7 +484,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ClassEditPart) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPart) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

 		if(targetEditPart instanceof DataTypeEditPart) {

@@ -532,7 +532,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ClassEditPart) {

 			types.add(UMLElementTypes.Substitution_4004);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPart) {

 			types.add(UMLElementTypes.Substitution_4004);

 		}

 		if(targetEditPart instanceof DataTypeEditPart) {

@@ -592,7 +592,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ClassEditPart) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPart) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

 		if(targetEditPart instanceof DataTypeEditPart) {

@@ -682,7 +682,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ClassEditPart) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPart) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

 		if(targetEditPart instanceof DataTypeEditPart) {

@@ -772,7 +772,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ClassEditPart) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPart) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

 		if(targetEditPart instanceof DataTypeEditPart) {

@@ -862,7 +862,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ClassEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof DataTypeEditPart) {

@@ -952,7 +952,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ClassEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof DataTypeEditPart) {

@@ -1042,7 +1042,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ClassEditPart) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPart) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

 		if(targetEditPart instanceof DataTypeEditPart) {

@@ -1129,7 +1129,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ClassEditPart) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPart) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

 		if(targetEditPart instanceof DataTypeEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PrimitiveTypeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeEditPartCN.java
index f4c2c30215d..3a9a371e123 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PrimitiveTypeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -39,22 +39,22 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomPrimitiveTypeItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.PrimitiveTypeItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.common.editparts.ClassifierEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.PrimitiveTypeFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomPrimitiveTypeItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PrimitiveTypeItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PrimitiveTypeFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -359,7 +359,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ClassEditPartCN) {

 			types.add(UMLElementTypes.AssociationClass_4017);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN) {

 			types.add(UMLElementTypes.AssociationClass_4017);

 		}

 		if(targetEditPart instanceof DataTypeEditPartCN) {

@@ -407,7 +407,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ClassEditPartCN) {

 			types.add(UMLElementTypes.Association_4001);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN) {

 			types.add(UMLElementTypes.Association_4001);

 		}

 		if(targetEditPart instanceof DataTypeEditPartCN) {

@@ -455,7 +455,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ClassEditPartCN) {

 			types.add(UMLElementTypes.Association_4019);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN) {

 			types.add(UMLElementTypes.Association_4019);

 		}

 		if(targetEditPart instanceof DataTypeEditPartCN) {

@@ -503,7 +503,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ClassEditPartCN) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

 		if(targetEditPart instanceof DataTypeEditPartCN) {

@@ -551,7 +551,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ClassEditPartCN) {

 			types.add(UMLElementTypes.Substitution_4004);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN) {

 			types.add(UMLElementTypes.Substitution_4004);

 		}

 		if(targetEditPart instanceof DataTypeEditPartCN) {

@@ -638,7 +638,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ClassEditPartCN) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

 		if(targetEditPart instanceof DataTypeEditPartCN) {

@@ -728,7 +728,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ClassEditPartCN) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

 		if(targetEditPart instanceof DataTypeEditPartCN) {

@@ -818,7 +818,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ClassEditPartCN) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

 		if(targetEditPart instanceof DataTypeEditPartCN) {

@@ -908,7 +908,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ClassEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof DataTypeEditPartCN) {

@@ -998,7 +998,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ClassEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof DataTypeEditPartCN) {

@@ -1079,7 +1079,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ClassEditPartCN) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

 		if(targetEditPart instanceof DataTypeEditPartCN) {

@@ -1154,7 +1154,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ClassEditPartCN) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

 		if(targetEditPart instanceof DataTypeEditPartCN) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PrimitiveTypeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeNameEditPart.java
index ca1f19a9635..3117bd2661d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PrimitiveTypeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeNameEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,8 +59,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -339,7 +339,7 @@ public class PrimitiveTypeNameEditPart extends CompartmentEditPart implements IT
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.PrimitiveType_2009, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.PrimitiveType_2009, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -587,7 +587,7 @@ public class PrimitiveTypeNameEditPart extends CompartmentEditPart implements IT
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PrimitiveTypeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeNameEditPartCN.java
index 280f31d264e..be44a77dc05 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PrimitiveTypeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeNameEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,8 +59,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -339,7 +339,7 @@ public class PrimitiveTypeNameEditPartCN extends CompartmentEditPart implements
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.PrimitiveType_3026, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeNameEditPartCN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.PrimitiveType_3026, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -587,7 +587,7 @@ public class PrimitiveTypeNameEditPartCN extends CompartmentEditPart implements
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ProfileApplicationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ProfileApplicationEditPart.java
index 41bdca8bc7e..e5097d2139e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ProfileApplicationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ProfileApplicationEditPart.java
@@ -10,19 +10,19 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gef.EditPolicy;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.ProfileApplicationItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.edge.DashedEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ProfileApplicationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PropertyForClassEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForClassEditPart.java
index 331f9fb1d56..22e28dbfb78 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PropertyForClassEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForClassEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -54,20 +54,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.AppliedStereotypePropertyDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.PropertyLabelEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.PropertyForClassItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -77,6 +63,20 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypePropertyDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.PropertyLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PropertyForClassItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -353,7 +353,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Property_3012, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.PropertyForClassEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Property_3012, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForClassEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -601,7 +601,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PropertyForComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForComponentEditPart.java
index 2a856560e7c..3893fcf4ef0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PropertyForComponentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForComponentEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -54,20 +54,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.AppliedStereotypePropertyDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.PropertyLabelEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.PropertyForComponentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -77,6 +63,20 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypePropertyDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.PropertyLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PropertyForComponentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -353,7 +353,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Property_3002, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.PropertyForComponentEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Property_3002, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForComponentEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -601,7 +601,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PropertyForInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForInterfaceEditPart.java
index f3d45331fe5..45a45e34f3e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PropertyForInterfaceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForInterfaceEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -54,20 +54,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.AppliedStereotypePropertyDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.PropertyLabelEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.PropertyForInterfaceItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -77,6 +63,20 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypePropertyDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.PropertyLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PropertyForInterfaceItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -353,7 +353,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Property_3006, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.PropertyForInterfaceEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Property_3006, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForInterfaceEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -601,7 +601,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PropertyForSignalEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForSignalEditPart.java
index ab29fa27a3f..44df7b322cb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PropertyForSignalEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForSignalEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -54,20 +54,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.AppliedStereotypePropertyDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.PropertyLabelEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.PropertyForSignalItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -77,6 +63,20 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypePropertyDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.PropertyLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PropertyForSignalItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -353,7 +353,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Property_3005, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.PropertyForSignalEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Property_3005, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForSignalEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -601,7 +601,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PropertyforDataTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyforDataTypeEditPart.java
index 8f2bd57f7be..ebec28fcdd2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/PropertyforDataTypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyforDataTypeEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -54,20 +54,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.AppliedStereotypePropertyDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.PropertyLabelEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.PropertyforDataTypeItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -77,6 +63,20 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypePropertyDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.PropertyLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PropertyforDataTypeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -353,7 +353,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Property_3018, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.PropertyforDataTypeEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Property_3018, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyforDataTypeEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -601,7 +601,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/RealizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RealizationEditPart.java
index 37fc7c4bdc5..ea60bc52015 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/RealizationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RealizationEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gef.EditPart;

@@ -18,13 +18,13 @@ import org.eclipse.gef.EditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomRealizationItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.RealizationItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.edge.InterfaceRealizationFigure;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomRealizationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.RealizationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/RealizationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RealizationNameEditPart.java
index 61a00c7db4a..2749bc0c125 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/RealizationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RealizationNameEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +59,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -125,7 +125,7 @@ public class RealizationNameEditPart extends LabelEditPart implements ITextAware
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationNameEditPart.VISUAL_ID), new Point(0, 60));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationNameEditPart.VISUAL_ID), new Point(0, 60));

 	}

 

 	/**

@@ -341,7 +341,7 @@ public class RealizationNameEditPart extends LabelEditPart implements ITextAware
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Realization_4005, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Realization_4005, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -589,7 +589,7 @@ public class RealizationNameEditPart extends LabelEditPart implements ITextAware
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -741,7 +741,7 @@ public class RealizationNameEditPart extends LabelEditPart implements ITextAware
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ReceptionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ReceptionEditPart.java
index b0ed46816ea..60b64297c00 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ReceptionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ReceptionEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -55,18 +55,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.ReceptionItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -76,8 +64,20 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ReceptionItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -362,7 +362,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Reception_3011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.ReceptionEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Reception_3011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ReceptionEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -610,7 +610,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/RedefinableTemplateSignatureEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RedefinableTemplateSignatureEditPart.java
index 5d0098a033f..382722e1cca 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/RedefinableTemplateSignatureEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RedefinableTemplateSignatureEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -42,17 +42,17 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.clazz.custom.edit.part.AbstractRedefinableTemplateSignatureEditPart;

-import org.eclipse.papyrus.diagram.clazz.custom.figure.TemplateFigure;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomRedefinableTemplateSignatureItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.RedefinableTemplateSignatureItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.AbstractRedefinableTemplateSignatureEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.TemplateFigure;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomRedefinableTemplateSignatureItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.RedefinableTemplateSignatureItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -364,7 +364,7 @@ AbstractRedefinableTemplateSignatureEditPart {
 		if(targetEditPart instanceof ShapeNamedElementEditPart) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

 		if(targetEditPart instanceof InstanceSpecificationEditPartCN) {

@@ -454,7 +454,7 @@ AbstractRedefinableTemplateSignatureEditPart {
 		if(targetEditPart instanceof ShapeNamedElementEditPart) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

 		if(targetEditPart instanceof InstanceSpecificationEditPartCN) {

@@ -544,7 +544,7 @@ AbstractRedefinableTemplateSignatureEditPart {
 		if(targetEditPart instanceof ShapeNamedElementEditPart) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

 		if(targetEditPart instanceof InstanceSpecificationEditPartCN) {

@@ -634,7 +634,7 @@ AbstractRedefinableTemplateSignatureEditPart {
 		if(targetEditPart instanceof ShapeNamedElementEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof InstanceSpecificationEditPartCN) {

@@ -724,7 +724,7 @@ AbstractRedefinableTemplateSignatureEditPart {
 		if(targetEditPart instanceof ShapeNamedElementEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof InstanceSpecificationEditPartCN) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/RedefinableTemplateSignatureTemplateParameterCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RedefinableTemplateSignatureTemplateParameterCompartmentEditPart.java
index a5b1aebc585..8d4d64ce769 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/RedefinableTemplateSignatureTemplateParameterCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RedefinableTemplateSignatureTemplateParameterCompartmentEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -24,12 +24,12 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CRedefinableTemplateSignatureTemplateParameterCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.RedefinableTemplateSignatureTemplateParameterCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CRedefinableTemplateSignatureTemplateParameterCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.RedefinableTemplateSignatureTemplateParameterCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

 

 /**

  * @generated

@@ -77,7 +77,7 @@ extends ListCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.RedefinableTemplateSignatureTemplateParameterCompartmentCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.RedefinableTemplateSignatureTemplateParameterCompartmentCanonicalEditPolicy());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ShapeNamedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ShapeNamedElementEditPart.java
index bdb596d5c7d..41a7d17d204 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ShapeNamedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ShapeNamedElementEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.ArrayList;

 import java.util.Collections;

@@ -47,25 +47,25 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ShapeNamedElementLayoutEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomShapeNamedElementItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.ShapeNamedElementItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.common.editparts.AbstractShapeEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ShapeNamedElementFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ShapeNamedElementLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomShapeNamedElementItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ShapeNamedElementItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractShapeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ShapeNamedElementFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -358,7 +358,7 @@ AbstractShapeEditPart {
 		if(targetEditPart instanceof DefaultNamedElementEditPart) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ShapeNamedElementEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ShapeNamedElementEditPart) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

 		if(targetEditPart instanceof RedefinableTemplateSignatureEditPart) {

@@ -448,7 +448,7 @@ AbstractShapeEditPart {
 		if(targetEditPart instanceof DefaultNamedElementEditPart) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ShapeNamedElementEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ShapeNamedElementEditPart) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

 		if(targetEditPart instanceof RedefinableTemplateSignatureEditPart) {

@@ -538,7 +538,7 @@ AbstractShapeEditPart {
 		if(targetEditPart instanceof DefaultNamedElementEditPart) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ShapeNamedElementEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ShapeNamedElementEditPart) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

 		if(targetEditPart instanceof RedefinableTemplateSignatureEditPart) {

@@ -628,7 +628,7 @@ AbstractShapeEditPart {
 		if(targetEditPart instanceof DefaultNamedElementEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ShapeNamedElementEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ShapeNamedElementEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof RedefinableTemplateSignatureEditPart) {

@@ -718,7 +718,7 @@ AbstractShapeEditPart {
 		if(targetEditPart instanceof DefaultNamedElementEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.ShapeNamedElementEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ShapeNamedElementEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof RedefinableTemplateSignatureEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ShapeNamedElementNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ShapeNamedElementNameEditPart.java
index 3785f2ccd9a..df1efeeb07f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ShapeNamedElementNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ShapeNamedElementNameEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -52,15 +52,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -70,6 +61,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -131,7 +131,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.ShapeNamedElementNameEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ShapeNamedElementNameEditPart.VISUAL_ID), new Point(0, 0));

 	}

 

 	/**

@@ -362,7 +362,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.NamedElement_2098, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.ShapeNamedElementNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.NamedElement_2098, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ShapeNamedElementNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -610,7 +610,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -769,7 +769,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ShortCutDiagramEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ShortCutDiagramEditPart.java
index 024fd82a34a..aa116ae4227 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/ShortCutDiagramEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ShortCutDiagramEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -43,17 +43,17 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomShortcutDiagramItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.ShortCutDiagramItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.common.editparts.AbstractShortCutDiagramEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShortCutDiagramEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.DiagramNodeFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomShortcutDiagramItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ShortCutDiagramItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractShortCutDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShortCutDiagramEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.DiagramNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.swt.graphics.Color;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/SignalAttributeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalAttributeCompartmentEditPart.java
index 72f10b5ff0e..01f06e281f6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/SignalAttributeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalAttributeCompartmentEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -26,11 +26,11 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.SignalAttributeCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.SignalAttributeCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

 

 /**

  * @generated

@@ -79,7 +79,7 @@ extends ListCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.SignalAttributeCompartmentCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.SignalAttributeCompartmentCanonicalEditPolicy());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/SignalAttributeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalAttributeCompartmentEditPartCN.java
index 627c580da85..fa517b6da9f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/SignalAttributeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalAttributeCompartmentEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -25,12 +25,12 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditP
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.SignalAttributeCompartmentItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.common.editparts.ResizeableListCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.SignalAttributeCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ResizeableListCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

 

 /**

  * @generated

@@ -79,7 +79,7 @@ extends ResizeableListCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.SignalAttributeCompartmentCanonicalEditPolicyCN());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.SignalAttributeCompartmentCanonicalEditPolicyCN());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/SignalEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalEditPart.java
index 63ab9aab6ba..9a754e7da51 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/SignalEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -46,29 +46,29 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomSignalItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.SignalItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.common.editparts.ClassifierEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.BorderItemResizableEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.SignalFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.common.locator.TemplateBorderItemLocator;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomSignalItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.SignalItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.SignalFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.common.locator.TemplateBorderItemLocator;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -110,7 +110,7 @@ ClassifierEditPart {
 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.SignalCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.SignalCanonicalEditPolicy());

 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.POPUPBAR_ROLE, new HyperLinkPopupBarEditPolicy());

@@ -388,7 +388,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ComponentEditPart) {

 			types.add(UMLElementTypes.AssociationClass_4017);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.SignalEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPart) {

 			types.add(UMLElementTypes.AssociationClass_4017);

 		}

 		if(targetEditPart instanceof InterfaceEditPart) {

@@ -436,7 +436,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ComponentEditPart) {

 			types.add(UMLElementTypes.Association_4001);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.SignalEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPart) {

 			types.add(UMLElementTypes.Association_4001);

 		}

 		if(targetEditPart instanceof InterfaceEditPart) {

@@ -484,7 +484,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ComponentEditPart) {

 			types.add(UMLElementTypes.Association_4019);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.SignalEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPart) {

 			types.add(UMLElementTypes.Association_4019);

 		}

 		if(targetEditPart instanceof InterfaceEditPart) {

@@ -532,7 +532,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ComponentEditPart) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.SignalEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPart) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

 		if(targetEditPart instanceof InterfaceEditPart) {

@@ -580,7 +580,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ComponentEditPart) {

 			types.add(UMLElementTypes.Substitution_4004);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.SignalEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPart) {

 			types.add(UMLElementTypes.Substitution_4004);

 		}

 		if(targetEditPart instanceof InterfaceEditPart) {

@@ -634,7 +634,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ComponentEditPart) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.SignalEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPart) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

 		if(targetEditPart instanceof InterfaceEditPart) {

@@ -724,7 +724,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ComponentEditPart) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.SignalEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPart) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

 		if(targetEditPart instanceof InterfaceEditPart) {

@@ -814,7 +814,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ComponentEditPart) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.SignalEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPart) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

 		if(targetEditPart instanceof InterfaceEditPart) {

@@ -904,7 +904,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ComponentEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.SignalEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof InterfaceEditPart) {

@@ -994,7 +994,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ComponentEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.SignalEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof InterfaceEditPart) {

@@ -1084,7 +1084,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ComponentEditPart) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.SignalEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPart) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

 		if(targetEditPart instanceof InterfaceEditPart) {

@@ -1171,7 +1171,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ComponentEditPart) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.SignalEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPart) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

 		if(targetEditPart instanceof InterfaceEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/SignalEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalEditPartCN.java
index 7a03f99f002..4847eb72dfb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/SignalEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -46,29 +46,29 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomSignalItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.SignalItemSemanticEditPolicyCN;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.common.editparts.ClassifierEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.BorderItemResizableEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.SignalFigure;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.common.locator.TemplateBorderItemLocator;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomSignalItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.SignalItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.SignalFigure;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.common.locator.TemplateBorderItemLocator;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -110,7 +110,7 @@ ClassifierEditPart {
 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.SignalCanonicalEditPolicyCN());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.SignalCanonicalEditPolicyCN());

 

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.POPUPBAR_ROLE, new HyperLinkPopupBarEditPolicy());

@@ -409,7 +409,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ComponentEditPartCN) {

 			types.add(UMLElementTypes.AssociationClass_4017);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.SignalEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPartCN) {

 			types.add(UMLElementTypes.AssociationClass_4017);

 		}

 		if(targetEditPart instanceof InterfaceEditPartCN) {

@@ -457,7 +457,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ComponentEditPartCN) {

 			types.add(UMLElementTypes.Association_4001);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.SignalEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPartCN) {

 			types.add(UMLElementTypes.Association_4001);

 		}

 		if(targetEditPart instanceof InterfaceEditPartCN) {

@@ -505,7 +505,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ComponentEditPartCN) {

 			types.add(UMLElementTypes.Association_4019);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.SignalEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPartCN) {

 			types.add(UMLElementTypes.Association_4019);

 		}

 		if(targetEditPart instanceof InterfaceEditPartCN) {

@@ -553,7 +553,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ComponentEditPartCN) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.SignalEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPartCN) {

 			types.add(UMLElementTypes.Generalization_4002);

 		}

 		if(targetEditPart instanceof InterfaceEditPartCN) {

@@ -601,7 +601,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ComponentEditPartCN) {

 			types.add(UMLElementTypes.Substitution_4004);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.SignalEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPartCN) {

 			types.add(UMLElementTypes.Substitution_4004);

 		}

 		if(targetEditPart instanceof InterfaceEditPartCN) {

@@ -682,7 +682,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ComponentEditPartCN) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.SignalEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPartCN) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

 		if(targetEditPart instanceof InterfaceEditPartCN) {

@@ -772,7 +772,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ComponentEditPartCN) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.SignalEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPartCN) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

 		if(targetEditPart instanceof InterfaceEditPartCN) {

@@ -862,7 +862,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ComponentEditPartCN) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.SignalEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPartCN) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

 		if(targetEditPart instanceof InterfaceEditPartCN) {

@@ -952,7 +952,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ComponentEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.SignalEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof InterfaceEditPartCN) {

@@ -1042,7 +1042,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ComponentEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.SignalEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPartCN) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof InterfaceEditPartCN) {

@@ -1123,7 +1123,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ComponentEditPartCN) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.SignalEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPartCN) {

 			types.add(UMLElementTypes.ElementImport_4009);

 		}

 		if(targetEditPart instanceof InterfaceEditPartCN) {

@@ -1198,7 +1198,7 @@ ClassifierEditPart {
 		if(targetEditPart instanceof ComponentEditPartCN) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.SignalEditPartCN) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPartCN) {

 			types.add(UMLElementTypes.TemplateBinding_4015);

 		}

 		if(targetEditPart instanceof InterfaceEditPartCN) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/SignalNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalNameEditPart.java
index 3f41dc0325c..137d22449e1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/SignalNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalNameEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,8 +59,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -339,7 +339,7 @@ public class SignalNameEditPart extends CompartmentEditPart implements ITextAwar
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Signal_2003, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.SignalNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Signal_2003, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -587,7 +587,7 @@ public class SignalNameEditPart extends CompartmentEditPart implements ITextAwar
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/SignalNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalNameEditPartCN.java
index 5c6ad23356b..76e8671dc1b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/SignalNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalNameEditPartCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

-import org.eclipse.papyrus.diagram.common.util.DiagramEditPartsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,8 +59,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

-import org.eclipse.papyrus.umlutils.ui.VisualInformationPapyrusConstant;

-import org.eclipse.papyrus.umlutils.ui.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

+import org.eclipse.papyrus.uml.tools.utils.ui.helper.NameLabelIconHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -339,7 +339,7 @@ public class SignalNameEditPartCN extends CompartmentEditPart implements ITextAw
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Signal_3022, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.SignalNameEditPartCN.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Signal_3022, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalNameEditPartCN.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -587,7 +587,7 @@ public class SignalNameEditPartCN extends CompartmentEditPart implements ITextAw
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/SlotEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SlotEditPart.java
index 3a2f3446bcc..2c6c38b5c74 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/SlotEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SlotEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -54,18 +54,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.SlotDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.SlotItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.UMLCompartmentEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -75,6 +63,18 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.SlotDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.SlotItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -348,7 +348,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Slot_3030, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.SlotEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Slot_3030, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SlotEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -596,7 +596,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/SourceISLinkLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SourceISLinkLabelEditPart.java
index 1d87d631d77..627d3f688ed 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/SourceISLinkLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SourceISLinkLabelEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,17 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ISRoleSourceDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.InstanceSpecificationRoleDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -70,6 +59,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ISRoleSourceDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.InstanceSpecificationRoleDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -127,7 +127,7 @@ public class SourceISLinkLabelEditPart extends LabelEditPart implements ITextAwa
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.SourceISLinkLabelEditPart.VISUAL_ID), new Point(0, 20));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SourceISLinkLabelEditPart.VISUAL_ID), new Point(0, 20));

 	}

 

 	/**

@@ -344,7 +344,7 @@ public class SourceISLinkLabelEditPart extends LabelEditPart implements ITextAwa
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.InstanceSpecification_4021, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.SourceISLinkLabelEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.InstanceSpecification_4021, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SourceISLinkLabelEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -592,7 +592,7 @@ public class SourceISLinkLabelEditPart extends LabelEditPart implements ITextAwa
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -736,7 +736,7 @@ public class SourceISLinkLabelEditPart extends LabelEditPart implements ITextAwa
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/role.gif";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/role.gif";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/SubstitutionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SubstitutionEditPart.java
index 6f8ff27f4fd..a743e22ef78 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/SubstitutionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SubstitutionEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gef.EditPart;

@@ -18,13 +18,13 @@ import org.eclipse.gef.EditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomSubstitutionItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.SubstitutionItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.edge.DashedEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomSubstitutionItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.SubstitutionItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/SubstitutionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SubstitutionNameEditPart.java
index eee35afb536..25a2f6546c2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/SubstitutionNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SubstitutionNameEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +59,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -125,7 +125,7 @@ public class SubstitutionNameEditPart extends LabelEditPart implements ITextAwar
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.SubstitutionNameEditPart.VISUAL_ID), new Point(0, 60));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionNameEditPart.VISUAL_ID), new Point(0, 60));

 	}

 

 	/**

@@ -341,7 +341,7 @@ public class SubstitutionNameEditPart extends LabelEditPart implements ITextAwar
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Substitution_4004, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.SubstitutionNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Substitution_4004, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -589,7 +589,7 @@ public class SubstitutionNameEditPart extends LabelEditPart implements ITextAwar
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -741,7 +741,7 @@ public class SubstitutionNameEditPart extends LabelEditPart implements ITextAwar
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/TargetISLinkLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TargetISLinkLabelEditPart.java
index 433c2e21dec..7be45b0e6dc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/TargetISLinkLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TargetISLinkLabelEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,17 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ISRoleTargetDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.InstanceSpecificationRoleDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -70,6 +59,17 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ISRoleTargetDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.InstanceSpecificationRoleDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -127,7 +127,7 @@ public class TargetISLinkLabelEditPart extends LabelEditPart implements ITextAwa
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.TargetISLinkLabelEditPart.VISUAL_ID), new Point(0, 20));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TargetISLinkLabelEditPart.VISUAL_ID), new Point(0, 20));

 	}

 

 	/**

@@ -344,7 +344,7 @@ public class TargetISLinkLabelEditPart extends LabelEditPart implements ITextAwa
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.InstanceSpecification_4021, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.TargetISLinkLabelEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.InstanceSpecification_4021, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TargetISLinkLabelEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -592,7 +592,7 @@ public class TargetISLinkLabelEditPart extends LabelEditPart implements ITextAwa
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -736,7 +736,7 @@ public class TargetISLinkLabelEditPart extends LabelEditPart implements ITextAwa
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/role.gif";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/role.gif";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/TemplateBindingEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateBindingEditPart.java
index 33b0ed5cd39..77435da0175 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/TemplateBindingEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateBindingEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gef.EditPart;

@@ -18,12 +18,12 @@ import org.eclipse.gef.EditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.custom.figure.TemplateBindingFigure;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.TemplateBindingItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.TemplateBindingFigure;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.TemplateBindingItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/TemplateParameterEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateParameterEditPart.java
index ea0ee97ebfb..29be8926748 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/TemplateParameterEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateParameterEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -54,18 +54,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.custom.edit.part.AbstractTemplateParameterEditPart;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.TemplateParamaterDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.TemplateParameterItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -75,6 +63,18 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.AbstractTemplateParameterEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.TemplateParamaterDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.TemplateParameterItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -348,7 +348,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.TemplateParameter_3016, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.TemplateParameterEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.TemplateParameter_3016, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateParameterEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -596,7 +596,7 @@ implements ITextAwareEditPart, IPrimaryEditPart {
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/TemplateSignatureEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateSignatureEditPart.java
index 22c7a87507f..20a43b2996d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/TemplateSignatureEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateSignatureEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.ArrayList;

 import java.util.LinkedList;

@@ -42,16 +42,16 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.clazz.custom.figure.TemplateFigure;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomRedefinableTemplateSignatureItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.TemplateSignatureItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.TemplateFigure;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomRedefinableTemplateSignatureItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.TemplateSignatureItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.swt.graphics.Color;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/TemplateSignatureTemplateParameterCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateSignatureTemplateParameterCompartmentEditPart.java
index 0aac7d1952b..5274d10885f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/TemplateSignatureTemplateParameterCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateSignatureTemplateParameterCompartmentEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -24,12 +24,12 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CTemplateSignatureTemplateParameterCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.TemplateSignatureTemplateParameterCompartmentItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CTemplateSignatureTemplateParameterCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.TemplateSignatureTemplateParameterCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

 

 /**

  * @generated

@@ -77,7 +77,7 @@ extends ListCompartmentEditPart
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

 

 		//in Papyrus diagrams are not strongly synchronised

-		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.diagram.clazz.edit.policies.TemplateSignatureTemplateParameterCompartmentCanonicalEditPolicy());

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.TemplateSignatureTemplateParameterCompartmentCanonicalEditPolicy());

 

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/TimeObservationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TimeObservationEditPart.java
index 0774eb1ce77..1112cb78753 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/TimeObservationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TimeObservationEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.ArrayList;

 import java.util.Collections;

@@ -45,25 +45,25 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.clazz.custom.edit.part.AbstractObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.custom.figure.TimeObservationNodeFigure;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.ObservationLayoutEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomTimeObservationItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.TimeObservationItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.ShowHideLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

-import org.eclipse.papyrus.diagram.common.locator.ExternalLabelPositionLocator;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.AbstractObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.TimeObservationNodeFigure;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ObservationLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomTimeObservationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.TimeObservationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;

 import org.eclipse.swt.graphics.Color;

 

 /**

@@ -353,7 +353,7 @@ AbstractObservationEditPart {
 		if(targetEditPart instanceof DurationObservationEditPart) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.TimeObservationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TimeObservationEditPart) {

 			types.add(UMLElementTypes.Realization_4005);

 		}

 		if(targetEditPart instanceof DefaultNamedElementEditPart) {

@@ -443,7 +443,7 @@ AbstractObservationEditPart {
 		if(targetEditPart instanceof DurationObservationEditPart) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.TimeObservationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TimeObservationEditPart) {

 			types.add(UMLElementTypes.Abstraction_4006);

 		}

 		if(targetEditPart instanceof DefaultNamedElementEditPart) {

@@ -533,7 +533,7 @@ AbstractObservationEditPart {
 		if(targetEditPart instanceof DurationObservationEditPart) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.TimeObservationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TimeObservationEditPart) {

 			types.add(UMLElementTypes.Usage_4007);

 		}

 		if(targetEditPart instanceof DefaultNamedElementEditPart) {

@@ -623,7 +623,7 @@ AbstractObservationEditPart {
 		if(targetEditPart instanceof DurationObservationEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.TimeObservationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TimeObservationEditPart) {

 			types.add(UMLElementTypes.Dependency_4008);

 		}

 		if(targetEditPart instanceof DefaultNamedElementEditPart) {

@@ -713,7 +713,7 @@ AbstractObservationEditPart {
 		if(targetEditPart instanceof DurationObservationEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.TimeObservationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TimeObservationEditPart) {

 			types.add(UMLElementTypes.Dependency_4018);

 		}

 		if(targetEditPart instanceof DefaultNamedElementEditPart) {

@@ -803,7 +803,7 @@ AbstractObservationEditPart {
 		if(targetEditPart instanceof DurationObservationEditPart) {

 			types.add(UMLElementTypes.TimeObservationEvent_4024);

 		}

-		if(targetEditPart instanceof org.eclipse.papyrus.diagram.clazz.edit.parts.TimeObservationEditPart) {

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TimeObservationEditPart) {

 			types.add(UMLElementTypes.TimeObservationEvent_4024);

 		}

 		if(targetEditPart instanceof DefaultNamedElementEditPart) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/TimeObservationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TimeObservationNameEditPart.java
index a5069edbb38..d999a7495eb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/TimeObservationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TimeObservationNameEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -52,15 +52,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -70,6 +61,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -131,7 +131,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.TimeObservationNameEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TimeObservationNameEditPart.VISUAL_ID), new Point(0, 0));

 	}

 

 	/**

@@ -362,7 +362,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.TimeObservation_2096, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.TimeObservationNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.TimeObservation_2096, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TimeObservationNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -610,7 +610,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -769,7 +769,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/TimeObservationStereotypeLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TimeObservationStereotypeLabelEditPart.java
index e37e37cd73e..c3311dc6c69 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/TimeObservationStereotypeLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TimeObservationStereotypeLabelEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -51,19 +51,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.AbstractLabelEditPart;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -73,6 +60,19 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -134,7 +134,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.TimeObservationStereotypeLabelEditPart.VISUAL_ID), new Point(0, 0));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TimeObservationStereotypeLabelEditPart.VISUAL_ID), new Point(0, 0));

 	}

 

 	/**

@@ -366,7 +366,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.TimeObservation_2096, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.TimeObservationStereotypeLabelEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.TimeObservation_2096, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TimeObservationStereotypeLabelEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -614,7 +614,7 @@ implements ITextAwareEditPart, IBorderItemEditPart, ILabelRoleProvider
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/UMLEditPartFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/UMLEditPartFactory.java
index 7dcb1eac99d..3230d9ce987 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/UMLEditPartFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/UMLEditPartFactory.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.FigureUtilities;

 import org.eclipse.draw2d.Label;

@@ -23,8 +23,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.viewers.CellEditor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.common.figure.node.IMultilineEditableFigure;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.IMultilineEditableFigure;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.widgets.Text;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/UsageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/UsageEditPart.java
index b4411013a49..35777f57710 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/UsageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/UsageEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.gef.EditPart;

@@ -18,13 +18,13 @@ import org.eclipse.gef.EditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.custom.policies.itemsemantic.CustomUsageItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UsageItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.common.editparts.UMLConnectionNodeEditPart;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.editpolicies.AppliedStereotypeUsageLabelDisplayEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.edge.DashedEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomUsageItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UsageItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeUsageLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/UsageNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/UsageNameEditPart.java
index 493a538f02d..3d25ac98c1c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/parts/UsageNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/UsageNameEditPart.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.parts;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.parts;

 

 import java.util.Collections;

 import java.util.List;

@@ -50,15 +50,6 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.jface.viewers.ICellEditorValidator;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLParserProvider;

-import org.eclipse.papyrus.diagram.common.directedit.MultilineLabelDirectEditManager;

-import org.eclipse.papyrus.diagram.common.editparts.ILabelRoleProvider;

-import org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition;

-import org.eclipse.papyrus.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

-import org.eclipse.papyrus.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.papyrus.extensionpoints.editors.Activator;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

 import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

@@ -68,6 +59,15 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
 import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

 import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

 import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLParserProvider;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.accessibility.AccessibleEvent;

 import org.eclipse.swt.graphics.Color;

@@ -125,7 +125,7 @@ public class UsageNameEditPart extends LabelEditPart implements ITextAwareEditPa
 	 * @generated

 	 */

 	static {

-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.UsageNameEditPart.VISUAL_ID), new Point(0, 40));

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageNameEditPart.VISUAL_ID), new Point(0, 40));

 	}

 

 	/**

@@ -341,7 +341,7 @@ public class UsageNameEditPart extends LabelEditPart implements ITextAwareEditPa
 	 */

 	public IParser getParser() {

 		if(parser == null) {

-			parser = UMLParserProvider.getParser(UMLElementTypes.Usage_4007, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.diagram.clazz.edit.parts.UsageNameEditPart.VISUAL_ID));

+			parser = UMLParserProvider.getParser(UMLElementTypes.Usage_4007, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageNameEditPart.VISUAL_ID));

 		}

 		return parser;

 	}

@@ -589,7 +589,7 @@ public class UsageNameEditPart extends LabelEditPart implements ITextAwareEditPa
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

@@ -741,7 +741,7 @@ public class UsageNameEditPart extends LabelEditPart implements ITextAwareEditPa
 	 * @generated

 	 */

 	public String getIconPathRole() {

-		return "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

+		return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png";//$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/AbstractionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AbstractionItemSemanticEditPolicy.java
index 5f2cc0f8b2f..3cedad9eaff 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/AbstractionItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AbstractionItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -21,39 +21,39 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/AssociationBranchItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationBranchItemSemanticEditPolicy.java
index 13bd8e11f5d..fe390f72280 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/AssociationBranchItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationBranchItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -21,59 +21,59 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/AssociationClassAttributeCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassAttributeCompartmentCanonicalEditPolicy.java
index cd86cf5bdde..24c179a89a8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/AssociationClassAttributeCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassAttributeCompartmentCanonicalEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PropertyForComponentEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/AssociationClassAttributeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassAttributeCompartmentItemSemanticEditPolicy.java
index 9bd2163eb3a..0ed21981006 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/AssociationClassAttributeCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassAttributeCompartmentItemSemanticEditPolicy.java
@@ -10,12 +10,12 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PropertyForComponentCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PropertyForComponentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/AssociationClassItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassItemSemanticEditPolicy.java
index f27e44c0986..aa793ed8f71 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/AssociationClassItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -21,62 +21,62 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.InterfaceRealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceRealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/AssociationClassLinkItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassLinkItemSemanticEditPolicy.java
index c0c61cf5577..85309a1263a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/AssociationClassLinkItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassLinkItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -21,62 +21,62 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.InterfaceRealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceRealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/AssociationClassNestedClassifierCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassNestedClassifierCompartmentCanonicalEditPolicy.java
index 7c79f416d49..ec5c2b8b637 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/AssociationClassNestedClassifierCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassNestedClassifierCompartmentCanonicalEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.NestedClassForComponentEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/AssociationClassNestedClassifierCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassNestedClassifierCompartmentItemSemanticEditPolicy.java
index 8ac81a8648b..58afad74931 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/AssociationClassNestedClassifierCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassNestedClassifierCompartmentItemSemanticEditPolicy.java
@@ -10,12 +10,12 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.NestedClassForComponentCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedClassForComponentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/AssociationClassOperationCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassOperationCompartmentCanonicalEditPolicy.java
index 98c5a8ff038..4d74a9aac79 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/AssociationClassOperationCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassOperationCompartmentCanonicalEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.OperationForComponentEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/AssociationClassOperationCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassOperationCompartmentItemSemanticEditPolicy.java
index b036102a0cd..c9f57f30f86 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/AssociationClassOperationCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationClassOperationCompartmentItemSemanticEditPolicy.java
@@ -10,12 +10,12 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.OperationForComponentCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.OperationForComponentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/AssociationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationItemSemanticEditPolicy.java
index bd3ab4f4c71..585e73e4189 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/AssociationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -21,59 +21,59 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/AssociationNodeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationNodeItemSemanticEditPolicy.java
index 9453fbf2a5a..a2de93cd479 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/AssociationNodeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/AssociationNodeItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -21,59 +21,59 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ClassAttributeCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassAttributeCompartmentCanonicalEditPolicy.java
index 00e6ba53c18..b352266746b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ClassAttributeCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassAttributeCompartmentCanonicalEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PropertyForClassEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForClassEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ClassAttributeCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassAttributeCompartmentCanonicalEditPolicyCN.java
index 471b813d35f..cedc73c088c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ClassAttributeCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassAttributeCompartmentCanonicalEditPolicyCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PropertyForClassEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForClassEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ClassAttributeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassAttributeCompartmentItemSemanticEditPolicy.java
index b258f7d68ae..af7166c2390 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ClassAttributeCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassAttributeCompartmentItemSemanticEditPolicy.java
@@ -10,12 +10,12 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PropertyForClassCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PropertyForClassCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ClassAttributeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassAttributeCompartmentItemSemanticEditPolicyCN.java
index 3fd9774e2f4..dc96f2a1d17 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ClassAttributeCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassAttributeCompartmentItemSemanticEditPolicyCN.java
@@ -10,12 +10,12 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PropertyForClassCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PropertyForClassCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ClassCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassCanonicalEditPolicy.java
index 8f45d93a9c4..cf0ae29745e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ClassCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassCanonicalEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ClassCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassCanonicalEditPolicyCN.java
index 1efba484c26..2cece227982 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ClassCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassCanonicalEditPolicyCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ClassItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassItemSemanticEditPolicy.java
index 3e859c7b845..46a96f7123f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ClassItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,63 +22,63 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.InterfaceRealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceRealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ClassItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassItemSemanticEditPolicyCN.java
index 29bbedcc253..d17a07cb544 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ClassItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassItemSemanticEditPolicyCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,63 +22,63 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.InterfaceRealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceRealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentCanonicalEditPolicy.java
index b1b0d5c7f6b..704fa24e7af 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentCanonicalEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.NestedClassForClassEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForClassEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentCanonicalEditPolicyCN.java
index bf8179167a8..16862ad58fb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentCanonicalEditPolicyCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.NestedClassForClassEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForClassEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentItemSemanticEditPolicy.java
index d839af16b8a..cfd26f40993 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentItemSemanticEditPolicy.java
@@ -10,12 +10,12 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.NestedClassForClassCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedClassForClassCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentItemSemanticEditPolicyCN.java
index 9aacb82667f..def8b9f4770 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassNestedClassifierCompartmentItemSemanticEditPolicyCN.java
@@ -10,12 +10,12 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.NestedClassForClassCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedClassForClassCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ClassOperationCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassOperationCompartmentCanonicalEditPolicy.java
index 2b7563a358b..827acc95ea8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ClassOperationCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassOperationCompartmentCanonicalEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -34,11 +34,11 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.OperationForClassEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ReceptionEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForClassEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ReceptionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ClassOperationCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassOperationCompartmentCanonicalEditPolicyCN.java
index 203fef48369..60bcf8b7162 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ClassOperationCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassOperationCompartmentCanonicalEditPolicyCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -34,11 +34,11 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.OperationForClassEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ReceptionEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForClassEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ReceptionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ClassOperationCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassOperationCompartmentItemSemanticEditPolicy.java
index 5048119099b..3aef1dcfe05 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ClassOperationCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassOperationCompartmentItemSemanticEditPolicy.java
@@ -10,13 +10,13 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.OperationForClassCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ReceptionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.OperationForClassCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ReceptionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ClassOperationCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassOperationCompartmentItemSemanticEditPolicyCN.java
index b63a8136868..c20e65a9f65 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ClassOperationCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassOperationCompartmentItemSemanticEditPolicyCN.java
@@ -10,13 +10,13 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.OperationForClassCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ReceptionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.OperationForClassCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ReceptionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ClassifierTemplateParameterItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassifierTemplateParameterItemSemanticEditPolicy.java
index aae30b607b5..50cd1ee25b8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ClassifierTemplateParameterItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ClassifierTemplateParameterItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -18,9 +18,9 @@ import org.eclipse.gef.commands.UnexecutableCommand;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/CommentAnnotatedElementItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/CommentAnnotatedElementItemSemanticEditPolicy.java
index 8ddd6746b24..350d4872a10 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/CommentAnnotatedElementItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/CommentAnnotatedElementItemSemanticEditPolicy.java
@@ -10,12 +10,12 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/CommentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/CommentItemSemanticEditPolicy.java
index 0006b0a78a6..ccc469e1102 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/CommentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/CommentItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -20,15 +20,15 @@ import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/CommentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/CommentItemSemanticEditPolicyCN.java
index 0a799ba3728..60a68bfdca4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/CommentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/CommentItemSemanticEditPolicyCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -20,15 +20,15 @@ import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ComponentAttributeCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentAttributeCompartmentCanonicalEditPolicy.java
index f4f9d23d33d..ec4a9976d82 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ComponentAttributeCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentAttributeCompartmentCanonicalEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PropertyForComponentEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ComponentAttributeCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentAttributeCompartmentCanonicalEditPolicyCN.java
index 2473ca868da..f80b49994a5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ComponentAttributeCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentAttributeCompartmentCanonicalEditPolicyCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PropertyForComponentEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ComponentAttributeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentAttributeCompartmentItemSemanticEditPolicy.java
index 2028cab7083..73c441da6c3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ComponentAttributeCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentAttributeCompartmentItemSemanticEditPolicy.java
@@ -10,12 +10,12 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PropertyForComponentCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PropertyForComponentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ComponentAttributeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentAttributeCompartmentItemSemanticEditPolicyCN.java
index e791bf8b592..b7d8328a8c8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ComponentAttributeCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentAttributeCompartmentItemSemanticEditPolicyCN.java
@@ -10,12 +10,12 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PropertyForComponentCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PropertyForComponentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ComponentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentCanonicalEditPolicy.java
index c49b28d17e6..44e706123a1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ComponentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentCanonicalEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ComponentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentCanonicalEditPolicyCN.java
index 8307d650e10..b5e53417f7c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ComponentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentCanonicalEditPolicyCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ComponentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentItemSemanticEditPolicy.java
index 459a93289fb..84ff4ad34c2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ComponentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,63 +22,63 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.InterfaceRealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceRealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ComponentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentItemSemanticEditPolicyCN.java
index 02d56ea73ad..d8435fa01d6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ComponentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentItemSemanticEditPolicyCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,63 +22,63 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.InterfaceRealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceRealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentCanonicalEditPolicy.java
index f1f6fbf5687..35db7898b02 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentCanonicalEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.NestedClassForComponentEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentCanonicalEditPolicyCN.java
index f50c02c5d9a..662da3c9986 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentCanonicalEditPolicyCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.NestedClassForComponentEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentItemSemanticEditPolicy.java
index 29920aaeacb..7ba241ddd96 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentItemSemanticEditPolicy.java
@@ -10,12 +10,12 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.NestedClassForComponentCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedClassForComponentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentItemSemanticEditPolicyCN.java
index 601c3f2b1fa..cfc8420e55f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentNestedClassifierCompartmentItemSemanticEditPolicyCN.java
@@ -10,12 +10,12 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.NestedClassForComponentCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedClassForComponentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ComponentOperationCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentCanonicalEditPolicy.java
index 17f13f4ef7a..0d42d3bee1a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ComponentOperationCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentCanonicalEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.OperationForComponentEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ComponentOperationCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentCanonicalEditPolicyCN.java
index 389ac5f950c..8d17027cb09 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ComponentOperationCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentCanonicalEditPolicyCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.OperationForComponentEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ComponentOperationCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentItemSemanticEditPolicy.java
index 86d81d3fd4c..3287e4a2023 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ComponentOperationCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentItemSemanticEditPolicy.java
@@ -10,12 +10,12 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.OperationForComponentCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.OperationForComponentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ComponentOperationCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentItemSemanticEditPolicyCN.java
index 529d27c10ee..c4593189848 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ComponentOperationCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ComponentOperationCompartmentItemSemanticEditPolicyCN.java
@@ -10,12 +10,12 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.OperationForComponentCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.OperationForComponentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ConnectableElementTemplateParameterItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ConnectableElementTemplateParameterItemSemanticEditPolicy.java
index 32223f84d0e..4dde4eb7249 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ConnectableElementTemplateParameterItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ConnectableElementTemplateParameterItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -18,9 +18,9 @@ import org.eclipse.gef.commands.UnexecutableCommand;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ConnectorDurationObservationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ConnectorDurationObservationItemSemanticEditPolicy.java
index b7ee38bb380..558527c4248 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ConnectorDurationObservationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ConnectorDurationObservationItemSemanticEditPolicy.java
@@ -10,12 +10,12 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ConnectorTimeObservationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ConnectorTimeObservationItemSemanticEditPolicy.java
index cf37991b9b3..dd4ab57b979 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ConnectorTimeObservationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ConnectorTimeObservationItemSemanticEditPolicy.java
@@ -10,12 +10,12 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ConstraintConstrainedElementItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ConstraintConstrainedElementItemSemanticEditPolicy.java
index f6da4fea0e7..4b032a4609e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ConstraintConstrainedElementItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ConstraintConstrainedElementItemSemanticEditPolicy.java
@@ -10,12 +10,12 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ConstraintItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ConstraintItemSemanticEditPolicy.java
index a5fae514005..cfbda95ae03 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ConstraintItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ConstraintItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -21,39 +21,39 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ConstraintItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ConstraintItemSemanticEditPolicyCN.java
index 5a46e2f0009..6ed1b5a7993 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ConstraintItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ConstraintItemSemanticEditPolicyCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -21,39 +21,39 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/DataTypeAttributeCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeAttributeCompartmentCanonicalEditPolicy.java
index ea26e855d1c..41effbcc4a8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/DataTypeAttributeCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeAttributeCompartmentCanonicalEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PropertyforDataTypeEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyforDataTypeEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/DataTypeAttributeCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeAttributeCompartmentCanonicalEditPolicyCN.java
index 8c2e8341ceb..4666789a9ed 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/DataTypeAttributeCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeAttributeCompartmentCanonicalEditPolicyCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PropertyforDataTypeEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyforDataTypeEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicy.java
index 96cb51e8022..727ea5769c2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicy.java
@@ -10,12 +10,12 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PropertyforDataTypeCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PropertyforDataTypeCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicyCN.java
index 361d13f10e3..df455826a05 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicyCN.java
@@ -10,12 +10,12 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PropertyforDataTypeCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PropertyforDataTypeCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/DataTypeCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeCanonicalEditPolicy.java
index b7125394c61..68db8750884 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/DataTypeCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeCanonicalEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/DataTypeCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeCanonicalEditPolicyCN.java
index 9db5a7bd3ec..fba28323dc8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/DataTypeCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeCanonicalEditPolicyCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/DataTypeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeItemSemanticEditPolicy.java
index 7b44f57c8ad..b614555a276 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/DataTypeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,60 +22,60 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/DataTypeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeItemSemanticEditPolicyCN.java
index f9d286725c4..c1b2d0e6ef3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/DataTypeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeItemSemanticEditPolicyCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,60 +22,60 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/DataTypeOperationCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeOperationCompartmentCanonicalEditPolicy.java
index 79b21c43cab..e1a21ffda83 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/DataTypeOperationCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeOperationCompartmentCanonicalEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.OperationForDataTypeEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForDataTypeEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/DataTypeOperationCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeOperationCompartmentCanonicalEditPolicyCN.java
index df470cc7ba0..1fba9d5cef9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/DataTypeOperationCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeOperationCompartmentCanonicalEditPolicyCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.OperationForDataTypeEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForDataTypeEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicy.java
index 0b8ee17abe4..3c1cd895c5e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicy.java
@@ -10,12 +10,12 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.OperationForDataTypeCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.OperationForDataTypeCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicyCN.java
index 71d533b5545..ddbcd7da92d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicyCN.java
@@ -10,12 +10,12 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.OperationForDataTypeCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.OperationForDataTypeCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/DefaultNamedElementItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DefaultNamedElementItemSemanticEditPolicy.java
index 48a30058fd0..dca35917bd6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/DefaultNamedElementItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DefaultNamedElementItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -21,36 +21,36 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/DependencyBranchSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DependencyBranchSemanticEditPolicy.java
index 698dc183bc2..873ebeb1fa8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/DependencyBranchSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DependencyBranchSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -21,39 +21,39 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/DependencyItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DependencyItemSemanticEditPolicy.java
index 563adda750f..d8e8464e763 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/DependencyItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DependencyItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -21,39 +21,39 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/DependencyNodeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DependencyNodeItemSemanticEditPolicy.java
index a9e28baaf0c..43a30e7d139 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/DependencyNodeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DependencyNodeItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -21,39 +21,39 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/DurationObservationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DurationObservationItemSemanticEditPolicy.java
index dbefd20e784..268e806ffd4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/DurationObservationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/DurationObservationItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -21,39 +21,39 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ElementImportItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ElementImportItemSemanticEditPolicy.java
index 101b0d67687..e88ed5d42b3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ElementImportItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ElementImportItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -20,15 +20,15 @@ import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/EnumerationEnumerationLiteralCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/EnumerationEnumerationLiteralCompartmentCanonicalEditPolicy.java
index 5be8019472d..cd8f3765ded 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/EnumerationEnumerationLiteralCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/EnumerationEnumerationLiteralCompartmentCanonicalEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationLiteralEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationLiteralEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/EnumerationEnumerationLiteralCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/EnumerationEnumerationLiteralCompartmentCanonicalEditPolicyCN.java
index e307857447a..5a9e4b0a876 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/EnumerationEnumerationLiteralCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/EnumerationEnumerationLiteralCompartmentCanonicalEditPolicyCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationLiteralEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationLiteralEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy.java
index a6a12604033..5dfd66f15cd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy.java
@@ -10,12 +10,12 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.EnumerationLiteralCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.EnumerationLiteralCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN.java
index 28aa948586a..0d62f583323 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN.java
@@ -10,12 +10,12 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.EnumerationLiteralCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.EnumerationLiteralCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/EnumerationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/EnumerationItemSemanticEditPolicy.java
index e613a090559..7230c46605d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/EnumerationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/EnumerationItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -21,59 +21,59 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/EnumerationItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/EnumerationItemSemanticEditPolicyCN.java
index 9eb716c32f7..4e748b52565 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/EnumerationItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/EnumerationItemSemanticEditPolicyCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -21,59 +21,59 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/EnumerationLiteralItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/EnumerationLiteralItemSemanticEditPolicy.java
index d27b98ab9c8..f5ae0b9bf90 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/EnumerationLiteralItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/EnumerationLiteralItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -18,9 +18,9 @@ import org.eclipse.gef.commands.UnexecutableCommand;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/GeneralizationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/GeneralizationItemSemanticEditPolicy.java
index b6019a7f83a..ef25742ecfa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/GeneralizationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/GeneralizationItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -21,18 +21,18 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.GeneralizationSetCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.GeneralizationSetReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.GeneralizationSetEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationSetCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationSetReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationSetEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/GeneralizationSetItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/GeneralizationSetItemSemanticEditPolicy.java
index 8b65e1f3c16..5ebc173cff5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/GeneralizationSetItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/GeneralizationSetItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -21,39 +21,39 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InstanceSpecificationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationItemSemanticEditPolicy.java
index a21bf1ab467..70e01610c43 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InstanceSpecificationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -21,39 +21,39 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InstanceSpecificationItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationItemSemanticEditPolicyCN.java
index 57604d05c81..0df6833197c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InstanceSpecificationItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationItemSemanticEditPolicyCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -21,39 +21,39 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InstanceSpecificationLinkItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationLinkItemSemanticEditPolicy.java
index bb05dcfa6eb..4fb46d91fc7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InstanceSpecificationLinkItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationLinkItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -21,39 +21,39 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentCanonicalEditPolicy.java
index 7ebf1d95065..95a24f4a56a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentCanonicalEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SlotEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SlotEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentCanonicalEditPolicyCN.java
index 187cb713c03..a083ca656d2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentCanonicalEditPolicyCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SlotEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SlotEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentItemSemanticEditPolicy.java
index 1f06b8dd7fb..932addcecc8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentItemSemanticEditPolicy.java
@@ -10,12 +10,12 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SlotCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SlotCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentItemSemanticEditPolicyCN.java
index 83a2010b499..c72f849f57c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InstanceSpecificationSlotCompartmentItemSemanticEditPolicyCN.java
@@ -10,12 +10,12 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SlotCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SlotCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicy.java
index dde03ed3cf8..a85d2ed4cbc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PropertyForInterfaceEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForInterfaceEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicyCN.java
index 860e43461f9..3a8afa35c53 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicyCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PropertyForInterfaceEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForInterfaceEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InterfaceAttributeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceAttributeCompartmentItemSemanticEditPolicy.java
index 29dbe4e5f19..ccb7148a308 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InterfaceAttributeCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceAttributeCompartmentItemSemanticEditPolicy.java
@@ -10,12 +10,12 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PropertyForInterfaceCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PropertyForInterfaceCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InterfaceAttributeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceAttributeCompartmentItemSemanticEditPolicyCN.java
index 3ebed6d82be..8a4731fbce1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InterfaceAttributeCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceAttributeCompartmentItemSemanticEditPolicyCN.java
@@ -10,12 +10,12 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PropertyForInterfaceCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PropertyForInterfaceCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InterfaceCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceCanonicalEditPolicy.java
index a2b62e12cee..2db8c1df12f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InterfaceCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceCanonicalEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InterfaceCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceCanonicalEditPolicyCN.java
index c16b8169b2b..b75621778bb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InterfaceCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceCanonicalEditPolicyCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InterfaceItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceItemSemanticEditPolicy.java
index 62d86998e35..3ce9a39ebe3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InterfaceItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,63 +22,63 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.InterfaceRealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceRealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InterfaceItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceItemSemanticEditPolicyCN.java
index 952aef2598e..2955e828a26 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InterfaceItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceItemSemanticEditPolicyCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,63 +22,63 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.InterfaceRealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.InterfaceRealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceRealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentCanonicalEditPolicy.java
index 69c4a8e90e2..138f53a8078 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentCanonicalEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.NestedClassForInterfaceEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForInterfaceEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentCanonicalEditPolicyCN.java
index 327144920b6..2aa0bef0d47 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentCanonicalEditPolicyCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.NestedClassForInterfaceEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForInterfaceEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentItemSemanticEditPolicy.java
index cc951248c2e..5c59b6a9ada 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentItemSemanticEditPolicy.java
@@ -10,12 +10,12 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.NestedClassForInterfaceCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedClassForInterfaceCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentItemSemanticEditPolicyCN.java
index 3f618040c16..83a6d83f6a5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceNestedClassifierCompartmentItemSemanticEditPolicyCN.java
@@ -10,12 +10,12 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.NestedClassForInterfaceCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.NestedClassForInterfaceCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicy.java
index 947b1ea1a55..b4355d5e1ed 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.OperationForInterfaceEditpart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForInterfaceEditpart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicyCN.java
index 38e5f23359b..879eaadf675 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicyCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.OperationForInterfaceEditpart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForInterfaceEditpart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicy.java
index c9cfe571905..c9181f17757 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicy.java
@@ -10,12 +10,12 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.OperationForInterfaceCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.OperationForInterfaceCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicyCN.java
index 940217e3e96..b3b05dde8ef 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicyCN.java
@@ -10,12 +10,12 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.OperationForInterfaceCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.OperationForInterfaceCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InterfaceRealizationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceRealizationItemSemanticEditPolicy.java
index 40cfd0833ba..d2f4dfa845d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/InterfaceRealizationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/InterfaceRealizationItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -21,39 +21,39 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ModelCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelCanonicalEditPolicy.java
index ad2667ba9b9..787ea9c8a85 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ModelCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelCanonicalEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -51,66 +51,66 @@ import org.eclipse.gmf.runtime.notation.Location;
 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.Size;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassDashedLinkEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationNodeEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ClassEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ClassEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ContainmentLinkEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ContainmentSubLinkEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DefaultNamedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyNodeEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.GeneralizationSetEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.InstanceSpecificationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.InstanceSpecificationEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.InstanceSpecificationLinkEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPartTN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageMergeEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ProfileApplicationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ShapeNamedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ShortCutDiagramEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SignalEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SignalEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TemplateSignatureEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLLinkDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassDashedLinkEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContainmentLinkEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContainmentSubLinkEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DefaultNamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationSetEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationLinkEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartTN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageMergeEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ProfileApplicationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ShapeNamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ShortCutDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateSignatureEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLLinkDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ModelCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelCanonicalEditPolicyCN.java
index d4685fffc24..a42aeebd47e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ModelCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelCanonicalEditPolicyCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,11 +32,11 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TemplateSignatureEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateSignatureEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ModelCanonicalEditPolicyTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelCanonicalEditPolicyTN.java
index ae6285c8ec3..dd69080196d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ModelCanonicalEditPolicyTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelCanonicalEditPolicyTN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,11 +32,11 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TemplateSignatureEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateSignatureEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ModelItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelItemSemanticEditPolicy.java
index 2c882040ee8..6a54e2dd959 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ModelItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

 import org.eclipse.gef.commands.Command;

@@ -18,28 +18,28 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;

 import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationNodeCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ClassCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ComponentCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DataTypeCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DefaultNamedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyNodeCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.EnumerationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.InstanceSpecificationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.InterfaceCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ModelCreateCommandTN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PrimitiveTypeCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ShapeNamedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ShortCutDiagramCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SignalCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.common.commands.DuplicateNamedElementCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationNodeCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ClassCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ComponentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DataTypeCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DefaultNamedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyNodeCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.EnumerationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InstanceSpecificationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ModelCreateCommandTN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PrimitiveTypeCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ShapeNamedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ShortCutDiagramCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SignalCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.common.commands.DuplicateNamedElementCommand;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ModelItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelItemSemanticEditPolicyCN.java
index 0a38fa37a43..9a0caf015d6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ModelItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelItemSemanticEditPolicyCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,53 +22,53 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageMergeCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageMergeReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ProfileApplicationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ProfileApplicationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateSignatureCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageMergeEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ProfileApplicationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageMergeCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageMergeReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ProfileApplicationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ProfileApplicationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateSignatureCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageMergeEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ProfileApplicationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ModelItemSemanticEditPolicyTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelItemSemanticEditPolicyTN.java
index 69748889cb9..467f75f468e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ModelItemSemanticEditPolicyTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelItemSemanticEditPolicyTN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,53 +22,53 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageMergeCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageMergeReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ProfileApplicationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ProfileApplicationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateSignatureCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageMergeEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ProfileApplicationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageMergeCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageMergeReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ProfileApplicationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ProfileApplicationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateSignatureCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageMergeEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ProfileApplicationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ModelPackageableElementCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelPackageableElementCompartmentCanonicalEditPolicyCN.java
index 671bfb147ae..0246d98695f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ModelPackageableElementCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelPackageableElementCompartmentCanonicalEditPolicyCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -34,21 +34,21 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ClassEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.InstanceSpecificationEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SignalEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ModelPackageableElementCompartmentCanonicalEditPolicyTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelPackageableElementCompartmentCanonicalEditPolicyTN.java
index 286003846ad..d93a6153761 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ModelPackageableElementCompartmentCanonicalEditPolicyTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelPackageableElementCompartmentCanonicalEditPolicyTN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -34,21 +34,21 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ClassEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.InstanceSpecificationEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SignalEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicyCN.java
index d22864fb938..934634daf17 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicyCN.java
@@ -10,23 +10,23 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ClassCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ComponentCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DataTypeCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.EnumerationCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.InstanceSpecificationCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.InterfaceCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ModelCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PrimitiveTypeCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SignalCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ClassCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ComponentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DataTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.EnumerationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InstanceSpecificationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ModelCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PrimitiveTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SignalCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicyTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicyTN.java
index 761681d4fa8..d3210f4d4bc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicyTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicyTN.java
@@ -10,23 +10,23 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ClassCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ComponentCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DataTypeCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.EnumerationCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.InstanceSpecificationCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.InterfaceCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ModelCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PrimitiveTypeCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SignalCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ClassCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ComponentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DataTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.EnumerationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InstanceSpecificationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ModelCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PrimitiveTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SignalCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/NestedClassForClassItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedClassForClassItemSemanticEditPolicy.java
index b5eff7fa023..0823bb21f9d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/NestedClassForClassItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedClassForClassItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -18,9 +18,9 @@ import org.eclipse.gef.commands.UnexecutableCommand;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/NestedClassForComponentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedClassForComponentItemSemanticEditPolicy.java
index ab2255f53a8..1c25f5fe312 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/NestedClassForComponentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedClassForComponentItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -18,9 +18,9 @@ import org.eclipse.gef.commands.UnexecutableCommand;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/NestedClassForInterfaceItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedClassForInterfaceItemSemanticEditPolicy.java
index 23ed6629d44..47054257a1f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/NestedClassForInterfaceItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/NestedClassForInterfaceItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -18,9 +18,9 @@ import org.eclipse.gef.commands.UnexecutableCommand;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/OperationForClassItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/OperationForClassItemSemanticEditPolicy.java
index 27c99767125..5f13e4c35fe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/OperationForClassItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/OperationForClassItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -18,9 +18,9 @@ import org.eclipse.gef.commands.UnexecutableCommand;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/OperationForDataTypeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/OperationForDataTypeItemSemanticEditPolicy.java
index 0b06ad0da77..8f54ebd3010 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/OperationForDataTypeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/OperationForDataTypeItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -18,9 +18,9 @@ import org.eclipse.gef.commands.UnexecutableCommand;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/OperationForInterfaceItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/OperationForInterfaceItemSemanticEditPolicy.java
index 2a9972769a3..146f8553945 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/OperationForInterfaceItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/OperationForInterfaceItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -18,9 +18,9 @@ import org.eclipse.gef.commands.UnexecutableCommand;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/OperationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/OperationItemSemanticEditPolicy.java
index bb10453a322..96c26e33851 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/OperationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/OperationItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -18,9 +18,9 @@ import org.eclipse.gef.commands.UnexecutableCommand;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/OperationTemplateParameterItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/OperationTemplateParameterItemSemanticEditPolicy.java
index 9613f4d892d..b2134900755 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/OperationTemplateParameterItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/OperationTemplateParameterItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -18,9 +18,9 @@ import org.eclipse.gef.commands.UnexecutableCommand;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/PackageCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackageCanonicalEditPolicy.java
index 94a32f0a514..0933ee52010 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/PackageCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackageCanonicalEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,11 +32,11 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TemplateSignatureEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateSignatureEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/PackageCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackageCanonicalEditPolicyCN.java
index 651d9fab399..f63393e5424 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/PackageCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackageCanonicalEditPolicyCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,11 +32,11 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TemplateSignatureEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateSignatureEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/PackageImportItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackageImportItemSemanticEditPolicy.java
index f3b851bd7db..eb871689613 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/PackageImportItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackageImportItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -20,15 +20,15 @@ import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/PackageItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackageItemSemanticEditPolicy.java
index f75083c4caa..729b0581782 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/PackageItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackageItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,53 +22,53 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageMergeCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageMergeReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ProfileApplicationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ProfileApplicationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateSignatureCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageMergeEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ProfileApplicationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageMergeCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageMergeReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ProfileApplicationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ProfileApplicationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateSignatureCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageMergeEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ProfileApplicationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/PackageItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackageItemSemanticEditPolicyCN.java
index 4aa184dc6d3..546d683a5e9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/PackageItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackageItemSemanticEditPolicyCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,53 +22,53 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageMergeCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageMergeReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ProfileApplicationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ProfileApplicationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateSignatureCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageMergeEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ProfileApplicationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageMergeCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageMergeReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ProfileApplicationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ProfileApplicationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateSignatureCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageMergeEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ProfileApplicationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/PackageMergeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackageMergeItemSemanticEditPolicy.java
index e61c645b52e..ec245d2a145 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/PackageMergeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackageMergeItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -20,15 +20,15 @@ import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/PackagePackageableElementCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackagePackageableElementCompartmentCanonicalEditPolicy.java
index 68925407554..fd711cabf68 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/PackagePackageableElementCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackagePackageableElementCompartmentCanonicalEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -34,21 +34,21 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ClassEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.InstanceSpecificationEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SignalEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/PackagePackageableElementCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackagePackageableElementCompartmentCanonicalEditPolicyCN.java
index 90dc2e19a4c..e0390ad0e95 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/PackagePackageableElementCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackagePackageableElementCompartmentCanonicalEditPolicyCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -34,21 +34,21 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ClassEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.InstanceSpecificationEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SignalEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicy.java
index 017336ee307..00a077606bb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicy.java
@@ -10,23 +10,23 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ClassCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ComponentCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DataTypeCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.EnumerationCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.InstanceSpecificationCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.InterfaceCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ModelCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PrimitiveTypeCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SignalCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ClassCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ComponentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DataTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.EnumerationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InstanceSpecificationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ModelCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PrimitiveTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SignalCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicyCN.java
index f8256c2da73..8efe74e1b3e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicyCN.java
@@ -10,23 +10,23 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ClassCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ComponentCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DataTypeCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.EnumerationCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.InstanceSpecificationCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.InterfaceCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ModelCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PrimitiveTypeCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SignalCreateCommandCN;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ClassCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ComponentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DataTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.EnumerationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InstanceSpecificationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.InterfaceCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ModelCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PrimitiveTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SignalCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/PrimitiveTypeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeItemSemanticEditPolicy.java
index 2eb60f17a0b..8eef87f22d9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/PrimitiveTypeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -21,59 +21,59 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/PrimitiveTypeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeItemSemanticEditPolicyCN.java
index 57ba9ae864e..4d05339ed65 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/PrimitiveTypeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PrimitiveTypeItemSemanticEditPolicyCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -21,59 +21,59 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ProfileApplicationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ProfileApplicationItemSemanticEditPolicy.java
index beb7d55a5d4..f20e60b65ef 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ProfileApplicationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ProfileApplicationItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -20,15 +20,15 @@ import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/PropertyForClassItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PropertyForClassItemSemanticEditPolicy.java
index e3261cde6c1..39713177839 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/PropertyForClassItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PropertyForClassItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -18,9 +18,9 @@ import org.eclipse.gef.commands.UnexecutableCommand;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/PropertyForComponentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PropertyForComponentItemSemanticEditPolicy.java
index 29567cf286f..e0c86864f59 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/PropertyForComponentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PropertyForComponentItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -18,9 +18,9 @@ import org.eclipse.gef.commands.UnexecutableCommand;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/PropertyForInterfaceItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PropertyForInterfaceItemSemanticEditPolicy.java
index 30834b68928..92f171a6ac3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/PropertyForInterfaceItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PropertyForInterfaceItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -18,9 +18,9 @@ import org.eclipse.gef.commands.UnexecutableCommand;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/PropertyForSignalItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PropertyForSignalItemSemanticEditPolicy.java
index 3a25809cec3..a634adcc279 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/PropertyForSignalItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PropertyForSignalItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -18,9 +18,9 @@ import org.eclipse.gef.commands.UnexecutableCommand;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/PropertyforDataTypeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PropertyforDataTypeItemSemanticEditPolicy.java
index 469bc44216e..cfcc74d6360 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/PropertyforDataTypeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/PropertyforDataTypeItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -18,9 +18,9 @@ import org.eclipse.gef.commands.UnexecutableCommand;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/RealizationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/RealizationItemSemanticEditPolicy.java
index 95d890421fc..6f23e27342d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/RealizationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/RealizationItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -21,39 +21,39 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ReceptionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ReceptionItemSemanticEditPolicy.java
index 7f79f15c0cc..153711cfc82 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ReceptionItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ReceptionItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -18,9 +18,9 @@ import org.eclipse.gef.commands.UnexecutableCommand;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/RedefinableTemplateSignatureItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/RedefinableTemplateSignatureItemSemanticEditPolicy.java
index a03ea083919..4c141d74942 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/RedefinableTemplateSignatureItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/RedefinableTemplateSignatureItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -21,36 +21,36 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/RedefinableTemplateSignatureTemplateParameterCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/RedefinableTemplateSignatureTemplateParameterCompartmentCanonicalEditPolicy.java
index 7dc839a233a..8fa49615757 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/RedefinableTemplateSignatureTemplateParameterCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/RedefinableTemplateSignatureTemplateParameterCompartmentCanonicalEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,13 +32,13 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ClassifierTemplateParameterEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectableElementTemplateParameterEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.OperationTemplateParameterEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TemplateParameterEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassifierTemplateParameterEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectableElementTemplateParameterEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationTemplateParameterEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateParameterEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/RedefinableTemplateSignatureTemplateParameterCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/RedefinableTemplateSignatureTemplateParameterCompartmentItemSemanticEditPolicy.java
index 0232320234b..be795203b12 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/RedefinableTemplateSignatureTemplateParameterCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/RedefinableTemplateSignatureTemplateParameterCompartmentItemSemanticEditPolicy.java
@@ -10,15 +10,15 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ClassifierTemplateParameterCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectableElementTemplateParameterCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.OperationTemplateParameterCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateParameterCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ClassifierTemplateParameterCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectableElementTemplateParameterCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.OperationTemplateParameterCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateParameterCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ShapeNamedElementItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ShapeNamedElementItemSemanticEditPolicy.java
index 4f188d7f15c..a0c0fdbcd51 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ShapeNamedElementItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ShapeNamedElementItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -21,36 +21,36 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ShortCutDiagramItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ShortCutDiagramItemSemanticEditPolicy.java
index 02a448ab280..d789d62c35e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/ShortCutDiagramItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/ShortCutDiagramItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -18,9 +18,9 @@ import org.eclipse.gef.commands.UnexecutableCommand;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/SignalAttributeCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalAttributeCompartmentCanonicalEditPolicy.java
index 2672bcba21b..39ee4cc59ad 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/SignalAttributeCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalAttributeCompartmentCanonicalEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PropertyForSignalEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForSignalEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/SignalAttributeCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalAttributeCompartmentCanonicalEditPolicyCN.java
index c3f93cb059c..e5c2b0efac9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/SignalAttributeCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalAttributeCompartmentCanonicalEditPolicyCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PropertyForSignalEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForSignalEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/SignalAttributeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalAttributeCompartmentItemSemanticEditPolicy.java
index f5462ef76d9..94cb8ec79a9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/SignalAttributeCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalAttributeCompartmentItemSemanticEditPolicy.java
@@ -10,12 +10,12 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PropertyForSignalCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PropertyForSignalCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/SignalAttributeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalAttributeCompartmentItemSemanticEditPolicyCN.java
index 39fda6646a7..a403a437103 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/SignalAttributeCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalAttributeCompartmentItemSemanticEditPolicyCN.java
@@ -10,12 +10,12 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PropertyForSignalCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PropertyForSignalCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/SignalCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalCanonicalEditPolicy.java
index f40f2fc976c..6220772a707 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/SignalCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalCanonicalEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/SignalCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalCanonicalEditPolicyCN.java
index 9ef213a90e1..b804877f5f3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/SignalCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalCanonicalEditPolicyCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,10 +32,10 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/SignalItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalItemSemanticEditPolicy.java
index f9381dc78d6..6fe3447f7ce 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/SignalItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,60 +22,60 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/SignalItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalItemSemanticEditPolicyCN.java
index 137a90ec38e..d99bd23c0cb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/SignalItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SignalItemSemanticEditPolicyCN.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -22,60 +22,60 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AssociationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.GeneralizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.PackageImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.SubstitutionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationBranchReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationClassLinkReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AssociationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.PackageImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RedefinableTemplateSignatureCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.SubstitutionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/SlotItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SlotItemSemanticEditPolicy.java
index c86c3bd0b05..df1e57a7126 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/SlotItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SlotItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -18,9 +18,9 @@ import org.eclipse.gef.commands.UnexecutableCommand;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/SubstitutionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SubstitutionItemSemanticEditPolicy.java
index eae65a41271..72632a81cec 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/SubstitutionItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/SubstitutionItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -21,39 +21,39 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/TemplateBindingItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/TemplateBindingItemSemanticEditPolicy.java
index d3f8e79e889..59be7c0b0df 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/TemplateBindingItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/TemplateBindingItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -20,15 +20,15 @@ import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/TemplateParameterItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/TemplateParameterItemSemanticEditPolicy.java
index 02c16db3efc..182f80b1cac 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/TemplateParameterItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/TemplateParameterItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -18,9 +18,9 @@ import org.eclipse.gef.commands.UnexecutableCommand;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/TemplateSignatureItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/TemplateSignatureItemSemanticEditPolicy.java
index e8847fded29..8a7f2ea6bbb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/TemplateSignatureItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/TemplateSignatureItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -20,15 +20,15 @@ import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/TemplateSignatureTemplateParameterCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/TemplateSignatureTemplateParameterCompartmentCanonicalEditPolicy.java
index db1ce3cec18..2ce7eac37f0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/TemplateSignatureTemplateParameterCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/TemplateSignatureTemplateParameterCompartmentCanonicalEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -32,12 +32,12 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ClassifierTemplateParameterEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.OperationTemplateParameterEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TemplateParameterEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramUpdater;

-import org.eclipse.papyrus.diagram.clazz.part.UMLNodeDescriptor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassifierTemplateParameterEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationTemplateParameterEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateParameterEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/TemplateSignatureTemplateParameterCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/TemplateSignatureTemplateParameterCompartmentItemSemanticEditPolicy.java
index 8068aea68c0..644c1bfe77a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/TemplateSignatureTemplateParameterCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/TemplateSignatureTemplateParameterCompartmentItemSemanticEditPolicy.java
@@ -10,14 +10,14 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ClassifierTemplateParameterCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.OperationTemplateParameterCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.TemplateParameterCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ClassifierTemplateParameterCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.OperationTemplateParameterCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.TemplateParameterCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/TimeObservationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/TimeObservationItemSemanticEditPolicy.java
index bbd0129dd95..51ee8f580f9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/TimeObservationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/TimeObservationItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -21,39 +21,39 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/UMLBaseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/UMLBaseItemSemanticEditPolicy.java
index 74d0cd831d1..0151358fef9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/UMLBaseItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/UMLBaseItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.Iterator;

 

@@ -43,13 +43,13 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.helpers.UMLBaseEditHelper;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.extendedtypes.types.IExtendedHintedElementType;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.helpers.UMLBaseEditHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.uml2.uml.Abstraction;

 import org.eclipse.uml2.uml.Association;

 import org.eclipse.uml2.uml.AssociationClass;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/UMLTextNonResizableEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/UMLTextNonResizableEditPolicy.java
index 522c1b45aa0..44e86ef64d4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/UMLTextNonResizableEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/UMLTextNonResizableEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import java.util.Collections;

 import java.util.List;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/UMLTextSelectionEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/UMLTextSelectionEditPolicy.java
index 61057fd0926..fd74c70e7d7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/UMLTextSelectionEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/UMLTextSelectionEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.draw2d.ColorConstants;

 import org.eclipse.draw2d.Figure;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/UsageItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/UsageItemSemanticEditPolicy.java
index eb7a45f16eb..ec01375160f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/edit/policies/UsageItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/UsageItemSemanticEditPolicy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.edit.policies;

+package org.eclipse.papyrus.uml.diagram.clazz.edit.policies;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

@@ -21,39 +21,39 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.AbstractionReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency2ReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.Dependency3CreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.DependencyReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.ElementImportReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.RealizationReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageCreateCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.commands.UsageReorientCommand;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.service.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.AbstractionReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorDurationObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConnectorTimeObservationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency2ReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.Dependency3CreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.DependencyReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.ElementImportReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.RealizationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.commands.UsageReorientCommand;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/expressions/UMLAbstractExpression.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/expressions/UMLAbstractExpression.java
index e866293057a..9b10b0b6e01 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/expressions/UMLAbstractExpression.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/expressions/UMLAbstractExpression.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.expressions;

+package org.eclipse.papyrus.uml.diagram.clazz.expressions;

 

 import java.math.BigDecimal;

 import java.math.BigInteger;

@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EEnum;

 import org.eclipse.emf.ecore.EEnumLiteral;

 import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/expressions/UMLOCLFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/expressions/UMLOCLFactory.java
index e60ec53cbe7..cbc8c99c3ab 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/expressions/UMLOCLFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/expressions/UMLOCLFactory.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.expressions;

+package org.eclipse.papyrus.uml.diagram.clazz.expressions;

 

 import java.util.Collections;

 import java.util.Map;

@@ -27,7 +27,7 @@ import org.eclipse.ocl.ecore.OCL.Helper;
 import org.eclipse.ocl.ecore.OCLExpression;

 import org.eclipse.ocl.ecore.Variable;

 import org.eclipse.ocl.options.ParsingOptions;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/navigator/UMLAbstractNavigatorItem.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLAbstractNavigatorItem.java
index 8efa544f40c..2c174e2baf1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/navigator/UMLAbstractNavigatorItem.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLAbstractNavigatorItem.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.navigator;

+package org.eclipse.papyrus.uml.diagram.clazz.navigator;

 

 import org.eclipse.core.runtime.IAdapterFactory;

 import org.eclipse.core.runtime.Platform;

@@ -30,13 +30,13 @@ public abstract class UMLAbstractNavigatorItem extends PlatformObject {
 		final ITabbedPropertySheetPageContributor propertySheetPageContributor = new ITabbedPropertySheetPageContributor() {

 

 			public String getContributorId() {

-				return "org.eclipse.papyrus.diagram.clazz"; //$NON-NLS-1$

+				return "org.eclipse.papyrus.uml.diagram.clazz"; //$NON-NLS-1$

 			}

 		};

 		Platform.getAdapterManager().registerAdapters(new IAdapterFactory() {

 

 			public Object getAdapter(Object adaptableObject, Class adapterType) {

-				if(adaptableObject instanceof org.eclipse.papyrus.diagram.clazz.navigator.UMLAbstractNavigatorItem && adapterType == ITabbedPropertySheetPageContributor.class) {

+				if(adaptableObject instanceof org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLAbstractNavigatorItem && adapterType == ITabbedPropertySheetPageContributor.class) {

 					return propertySheetPageContributor;

 				}

 				return null;

@@ -45,7 +45,7 @@ public abstract class UMLAbstractNavigatorItem extends PlatformObject {
 			public Class[] getAdapterList() {

 				return supportedTypes;

 			}

-		}, org.eclipse.papyrus.diagram.clazz.navigator.UMLAbstractNavigatorItem.class);

+		}, org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLAbstractNavigatorItem.class);

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/navigator/UMLDomainNavigatorContentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLDomainNavigatorContentProvider.java
index 87ce053541c..ac5134880e7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/navigator/UMLDomainNavigatorContentProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLDomainNavigatorContentProvider.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.navigator;

+package org.eclipse.papyrus.uml.diagram.clazz.navigator;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -27,7 +27,7 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

 import org.eclipse.gmf.runtime.emf.core.GMFEditingDomainFactory;

 import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.ui.IMemento;

 import org.eclipse.ui.navigator.ICommonContentExtensionSite;

 import org.eclipse.ui.navigator.ICommonContentProvider;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/navigator/UMLDomainNavigatorItem.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLDomainNavigatorItem.java
index 942fe87af22..76f892ebad6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/navigator/UMLDomainNavigatorItem.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLDomainNavigatorItem.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.navigator;

+package org.eclipse.papyrus.uml.diagram.clazz.navigator;

 

 import org.eclipse.core.runtime.IAdapterFactory;

 import org.eclipse.core.runtime.Platform;

@@ -33,8 +33,8 @@ public class UMLDomainNavigatorItem extends PlatformObject {
 		Platform.getAdapterManager().registerAdapters(new IAdapterFactory() {

 

 			public Object getAdapter(Object adaptableObject, Class adapterType) {

-				if(adaptableObject instanceof org.eclipse.papyrus.diagram.clazz.navigator.UMLDomainNavigatorItem) {

-					org.eclipse.papyrus.diagram.clazz.navigator.UMLDomainNavigatorItem domainNavigatorItem = (org.eclipse.papyrus.diagram.clazz.navigator.UMLDomainNavigatorItem)adaptableObject;

+				if(adaptableObject instanceof org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLDomainNavigatorItem) {

+					org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLDomainNavigatorItem domainNavigatorItem = (org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLDomainNavigatorItem)adaptableObject;

 					EObject eObject = domainNavigatorItem.getEObject();

 					if(adapterType == EObject.class) {

 						return eObject;

@@ -50,7 +50,7 @@ public class UMLDomainNavigatorItem extends PlatformObject {
 			public Class[] getAdapterList() {

 				return supportedTypes;

 			}

-		}, org.eclipse.papyrus.diagram.clazz.navigator.UMLDomainNavigatorItem.class);

+		}, org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLDomainNavigatorItem.class);

 	}

 

 	/**

@@ -102,8 +102,8 @@ public class UMLDomainNavigatorItem extends PlatformObject {
 	 * @generated

 	 */

 	public boolean equals(Object obj) {

-		if(obj instanceof org.eclipse.papyrus.diagram.clazz.navigator.UMLDomainNavigatorItem) {

-			return EcoreUtil.getURI(getEObject()).equals(EcoreUtil.getURI(((org.eclipse.papyrus.diagram.clazz.navigator.UMLDomainNavigatorItem)obj).getEObject()));

+		if(obj instanceof org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLDomainNavigatorItem) {

+			return EcoreUtil.getURI(getEObject()).equals(EcoreUtil.getURI(((org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLDomainNavigatorItem)obj).getEObject()));

 		}

 		return super.equals(obj);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/navigator/UMLDomainNavigatorLabelProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLDomainNavigatorLabelProvider.java
index 112de5feee4..1f69ebd7e1f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/navigator/UMLDomainNavigatorLabelProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLDomainNavigatorLabelProvider.java
@@ -10,11 +10,11 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.navigator;

+package org.eclipse.papyrus.uml.diagram.clazz.navigator;

 

 import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

 import org.eclipse.jface.viewers.ILabelProviderListener;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.ui.IMemento;

 import org.eclipse.ui.navigator.ICommonContentExtensionSite;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/navigator/UMLNavigatorActionProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorActionProvider.java
index ccbbdbc0e24..71095e9e951 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/navigator/UMLNavigatorActionProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorActionProvider.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.navigator;

+package org.eclipse.papyrus.uml.diagram.clazz.navigator;

 

 import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.emf.common.ui.URIEditorInput;

@@ -24,11 +24,11 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.action.Action;

 import org.eclipse.jface.action.IMenuManager;

 import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.ui.IActionBars;

 import org.eclipse.ui.IEditorInput;

 import org.eclipse.ui.IWorkbenchPage;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/navigator/UMLNavigatorContentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorContentProvider.java
index ac5754915fc..52231b776f4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/navigator/UMLNavigatorContentProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorContentProvider.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.navigator;

+package org.eclipse.papyrus.uml.diagram.clazz.navigator;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -28,8 +28,8 @@ import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.ui.IMemento;

 import org.eclipse.ui.navigator.ICommonContentExtensionSite;

 import org.eclipse.ui.navigator.ICommonContentProvider;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/navigator/UMLNavigatorGroup.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorGroup.java
index c71db19e3f9..3b301c29bec 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/navigator/UMLNavigatorGroup.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorGroup.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.navigator;

+package org.eclipse.papyrus.uml.diagram.clazz.navigator;

 

 import java.util.Collection;

 import java.util.LinkedList;

@@ -90,8 +90,8 @@ public class UMLNavigatorGroup extends UMLAbstractNavigatorItem {
 	 * @generated

 	 */

 	public boolean equals(Object obj) {

-		if(obj instanceof org.eclipse.papyrus.diagram.clazz.navigator.UMLNavigatorGroup) {

-			org.eclipse.papyrus.diagram.clazz.navigator.UMLNavigatorGroup anotherGroup = (org.eclipse.papyrus.diagram.clazz.navigator.UMLNavigatorGroup)obj;

+		if(obj instanceof org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorGroup) {

+			org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorGroup anotherGroup = (org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorGroup)obj;

 			if(getGroupName().equals(anotherGroup.getGroupName())) {

 				return getParent().equals(anotherGroup.getParent());

 			}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/navigator/UMLNavigatorItem.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorItem.java
index 62a930e5f1a..e69e691db60 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/navigator/UMLNavigatorItem.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorItem.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.navigator;

+package org.eclipse.papyrus.uml.diagram.clazz.navigator;

 

 import org.eclipse.core.runtime.IAdapterFactory;

 import org.eclipse.core.runtime.Platform;

@@ -31,8 +31,8 @@ public class UMLNavigatorItem extends UMLAbstractNavigatorItem {
 		Platform.getAdapterManager().registerAdapters(new IAdapterFactory() {

 

 			public Object getAdapter(Object adaptableObject, Class adapterType) {

-				if(adaptableObject instanceof org.eclipse.papyrus.diagram.clazz.navigator.UMLNavigatorItem && (adapterType == View.class || adapterType == EObject.class)) {

-					return ((org.eclipse.papyrus.diagram.clazz.navigator.UMLNavigatorItem)adaptableObject).getView();

+				if(adaptableObject instanceof org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorItem && (adapterType == View.class || adapterType == EObject.class)) {

+					return ((org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorItem)adaptableObject).getView();

 				}

 				return null;

 			}

@@ -40,7 +40,7 @@ public class UMLNavigatorItem extends UMLAbstractNavigatorItem {
 			public Class[] getAdapterList() {

 				return supportedTypes;

 			}

-		}, org.eclipse.papyrus.diagram.clazz.navigator.UMLNavigatorItem.class);

+		}, org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorItem.class);

 	}

 

 	/**

@@ -80,8 +80,8 @@ public class UMLNavigatorItem extends UMLAbstractNavigatorItem {
 	 * @generated

 	 */

 	public boolean equals(Object obj) {

-		if(obj instanceof org.eclipse.papyrus.diagram.clazz.navigator.UMLNavigatorItem) {

-			return EcoreUtil.getURI(getView()).equals(EcoreUtil.getURI(((org.eclipse.papyrus.diagram.clazz.navigator.UMLNavigatorItem)obj).getView()));

+		if(obj instanceof org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorItem) {

+			return EcoreUtil.getURI(getView()).equals(EcoreUtil.getURI(((org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorItem)obj).getView()));

 		}

 		return super.equals(obj);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/navigator/UMLNavigatorLabelProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorLabelProvider.java
index c224064fb82..cadcb81d15e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/navigator/UMLNavigatorLabelProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorLabelProvider.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.navigator;

+package org.eclipse.papyrus.uml.diagram.clazz.navigator;

 

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.notation.View;

@@ -20,10 +20,10 @@ import org.eclipse.jface.viewers.ITreePathLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;

 import org.eclipse.jface.viewers.TreePath;

 import org.eclipse.jface.viewers.ViewerLabel;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.ui.IMemento;

 import org.eclipse.ui.navigator.ICommonContentExtensionSite;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/navigator/UMLNavigatorLinkHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorLinkHelper.java
index 89815a6120c..f7f1e28d4a1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/navigator/UMLNavigatorLinkHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorLinkHelper.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.navigator;

+package org.eclipse.papyrus.uml.diagram.clazz.navigator;

 

 import org.eclipse.emf.common.ui.URIEditorInput;

 import org.eclipse.emf.common.util.URI;

@@ -27,7 +27,7 @@ import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.ui.IEditorInput;

 import org.eclipse.ui.IEditorPart;

 import org.eclipse.ui.IWorkbenchPage;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/navigator/UMLNavigatorSorter.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorSorter.java
index 1ce287fe15b..e64691a8472 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/navigator/UMLNavigatorSorter.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorSorter.java
@@ -10,10 +10,10 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.navigator;

+package org.eclipse.papyrus.uml.diagram.clazz.navigator;

 

 import org.eclipse.jface.viewers.ViewerSorter;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/parsers/AbstractParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/parsers/AbstractParser.java
index 4484610a8c9..cf94e6ed54a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/parsers/AbstractParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/parsers/AbstractParser.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.parsers;

+package org.eclipse.papyrus.uml.diagram.clazz.parsers;

 

 import java.util.Arrays;

 

@@ -34,8 +34,8 @@ import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

 import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/parsers/MessageFormatParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/parsers/MessageFormatParser.java
index 649c8001a2a..de8ca3bcffd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/parsers/MessageFormatParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/parsers/MessageFormatParser.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.parsers;

+package org.eclipse.papyrus.uml.diagram.clazz.parsers;

 

 import java.text.FieldPosition;

 import java.text.MessageFormat;

@@ -23,8 +23,8 @@ import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

 import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

 import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/DeleteElementAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/DeleteElementAction.java
index 8205c3b72f5..62a59b8d910 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/DeleteElementAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/DeleteElementAction.java
@@ -1,2 +1,3 @@
+package org.eclipse.papyrus.uml.diagram.clazz.part;

 //This file is not used. 

 //The DeleteElementAction is removed from the plugin and replaced by DeleteFromModelAction in the plugin org.eclipse.diagram.common.

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/DiagramEditorContextMenuProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/DiagramEditorContextMenuProvider.java
index 4925f5a4933..a95f7c7861b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/DiagramEditorContextMenuProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/DiagramEditorContextMenuProvider.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.part;

+package org.eclipse.papyrus.uml.diagram.clazz.part;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.transaction.util.TransactionUtil;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/LoadResourceAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/LoadResourceAction.java
index 2ca96be17f8..3c0e85e0901 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/LoadResourceAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/LoadResourceAction.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.part;

+package org.eclipse.papyrus.uml.diagram.clazz.part;

 

 import org.eclipse.core.commands.AbstractHandler;

 import org.eclipse.core.commands.ExecutionEvent;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/Messages.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/Messages.java
index e2343d66270..1f333b8c9b5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/Messages.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/Messages.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.part;

+package org.eclipse.papyrus.uml.diagram.clazz.part;

 

 import org.eclipse.osgi.util.NLS;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/ModelElementSelectionPage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/ModelElementSelectionPage.java
index e9028892c3a..d7519218977 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/ModelElementSelectionPage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/ModelElementSelectionPage.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.part;

+package org.eclipse.papyrus.uml.diagram.clazz.part;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.util.FeatureMap;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/UMLCreationWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLCreationWizard.java
index be0aa486828..5769b7e9ae9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/UMLCreationWizard.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLCreationWizard.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.part;

+package org.eclipse.papyrus.uml.diagram.clazz.part;

 

 import java.lang.reflect.InvocationTargetException;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/UMLCreationWizardPage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLCreationWizardPage.java
index 911c8775e3d..a408962112b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/UMLCreationWizardPage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLCreationWizardPage.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.part;

+package org.eclipse.papyrus.uml.diagram.clazz.part;

 

 import org.eclipse.core.runtime.IPath;

 import org.eclipse.core.runtime.Path;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/UMLDiagramActionBarContributor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramActionBarContributor.java
index 989e7632058..846d76c7cc7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/UMLDiagramActionBarContributor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramActionBarContributor.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.part;

+package org.eclipse.papyrus.uml.diagram.clazz.part;

 

 import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramActionBarContributor;

 import org.eclipse.jface.action.GroupMarker;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/UMLDiagramEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramEditor.java
index f6b611b84df..f8f9e41d900 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/UMLDiagramEditor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramEditor.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.part;

+package org.eclipse.papyrus.uml.diagram.clazz.part;

 

 import java.util.EventObject;

 

@@ -42,11 +42,11 @@ import org.eclipse.papyrus.core.adaptor.gmf.GmfMultiDiagramDocumentProvider;
 import org.eclipse.papyrus.core.editor.IMultiDiagramEditor;

 import org.eclipse.papyrus.core.services.ServiceException;

 import org.eclipse.papyrus.core.services.ServicesRegistry;

-import org.eclipse.papyrus.diagram.common.listeners.DropTargetListener;

-import org.eclipse.papyrus.diagram.common.part.PapyrusPaletteContextMenuProvider;

-import org.eclipse.papyrus.diagram.common.part.PapyrusPaletteViewer;

-import org.eclipse.papyrus.diagram.common.part.UmlGmfDiagramEditor;

-import org.eclipse.papyrus.diagram.common.service.PapyrusPaletteService;

+import org.eclipse.papyrus.uml.diagram.common.listeners.DropTargetListener;

+import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteContextMenuProvider;

+import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteViewer;

+import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor;

+import org.eclipse.papyrus.uml.diagram.common.service.PapyrusPaletteService;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.dnd.TransferData;

 import org.eclipse.swt.events.KeyEvent;

@@ -69,12 +69,12 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 	/**

 	 * @generated

 	 */

-	public static final String ID = "org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorID"; //$NON-NLS-1$

+	public static final String ID = "org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorID"; //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final String CONTEXT_ID = "org.eclipse.papyrus.diagram.clazz.ui.diagramContext"; //$NON-NLS-1$

+	public static final String CONTEXT_ID = "org.eclipse.papyrus.uml.diagram.clazz.ui.diagramContext"; //$NON-NLS-1$

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/UMLDiagramEditorPlugin.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramEditorPlugin.java
index e482bc46464..840a753e790 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/UMLDiagramEditorPlugin.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramEditorPlugin.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.part;

+package org.eclipse.papyrus.uml.diagram.clazz.part;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -30,11 +30,11 @@ import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
 import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.papyrus.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

-import org.eclipse.papyrus.diagram.clazz.expressions.UMLOCLFactory;

-import org.eclipse.papyrus.diagram.clazz.preferences.DiagramPreferenceInitializer;

-import org.eclipse.papyrus.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.papyrus.preferences.Activator;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.clazz.expressions.UMLOCLFactory;

+import org.eclipse.papyrus.uml.diagram.clazz.preferences.DiagramPreferenceInitializer;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.ElementInitializers;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.ui.plugin.AbstractUIPlugin;

 import org.eclipse.uml2.uml.edit.providers.UMLItemProviderAdapterFactory;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/UMLDiagramEditorUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramEditorUtil.java
index de668ab9c4b..08903175476 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/UMLDiagramEditorUtil.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramEditorUtil.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.part;

+package org.eclipse.papyrus.uml.diagram.clazz.part;

 

 import java.io.IOException;

 import java.util.Collections;

@@ -55,7 +55,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.dialogs.IDialogSettings;

 import org.eclipse.jface.wizard.Wizard;

 import org.eclipse.jface.wizard.WizardDialog;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.swt.widgets.Shell;

 import org.eclipse.ui.IWorkbenchPage;

 import org.eclipse.ui.PartInitException;

@@ -176,8 +176,8 @@ public class UMLDiagramEditorUtil {
 				}

 

 				try {

-					modelResource.save(org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorUtil.getSaveOptions());

-					diagramResource.save(org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorUtil.getSaveOptions());

+					modelResource.save(org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorUtil.getSaveOptions());

+					diagramResource.save(org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorUtil.getSaveOptions());

 				} catch (IOException e) {

 

 					UMLDiagramEditorPlugin.getInstance().logError("Unable to store model and diagram resources", e); //$NON-NLS-1$

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/UMLDiagramUpdateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramUpdateCommand.java
index 6eb21730ef7..3b2d3f95848 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/UMLDiagramUpdateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramUpdateCommand.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.part;

+package org.eclipse.papyrus.uml.diagram.clazz.part;

 

 import java.util.Iterator;

 import java.util.List;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/UMLDiagramUpdater.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramUpdater.java
index fe958b42a8e..15f068f3bba 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/UMLDiagramUpdater.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramUpdater.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.part;

+package org.eclipse.papyrus.uml.diagram.clazz.part;

 

 import java.util.Collection;

 import java.util.Collections;

@@ -24,8 +24,8 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.resource.Resource;

 import org.eclipse.emf.ecore.util.EcoreUtil;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.*;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.*;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.uml2.uml.Abstraction;

 import org.eclipse.uml2.uml.Association;

 import org.eclipse.uml2.uml.AssociationClass;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/UMLDocumentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDocumentProvider.java
index ee5d829388b..f333f04c677 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/UMLDocumentProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDocumentProvider.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.part;

+package org.eclipse.papyrus.uml.diagram.clazz.part;

 

 import java.io.IOException;

 import java.util.ArrayList;

@@ -150,7 +150,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi
 	 */

 	private TransactionalEditingDomain createEditingDomain() {

 		TransactionalEditingDomain editingDomain = DiagramEditingDomainFactory.getInstance().createEditingDomain();

-		editingDomain.setID("org.eclipse.papyrus.diagram.clazz.EditingDomain"); //$NON-NLS-1$

+		editingDomain.setID("org.eclipse.papyrus.uml.diagram.clazz.EditingDomain"); //$NON-NLS-1$

 		final NotificationFilter diagramResourceModifiedFilter = NotificationFilter.createNotifierFilter(editingDomain.getResourceSet()).and(NotificationFilter.createEventTypeFilter(Notification.ADD)).and(NotificationFilter.createFeatureFilter(ResourceSet.class, ResourceSet.RESOURCE_SET__RESOURCES));

 		editingDomain.getResourceSet().eAdapters().add(new Adapter() {

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/UMLInitDiagramFileAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLInitDiagramFileAction.java
index fb37bf8f504..152422d91ae 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/UMLInitDiagramFileAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLInitDiagramFileAction.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.part;

+package org.eclipse.papyrus.uml.diagram.clazz.part;

 

 import org.eclipse.core.resources.IFile;

 import org.eclipse.emf.common.util.URI;

@@ -26,7 +26,7 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.jface.wizard.Wizard;

 import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.swt.widgets.Shell;

 import org.eclipse.ui.IObjectActionDelegate;

 import org.eclipse.ui.IWorkbenchPart;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/UMLLinkDescriptor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLLinkDescriptor.java
index 705a263e834..c9fb95fe6c6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/UMLLinkDescriptor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLLinkDescriptor.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.part;

+package org.eclipse.papyrus.uml.diagram.clazz.part;

 

 import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.emf.ecore.EObject;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/UMLMatchingStrategy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLMatchingStrategy.java
index 101a701cc92..63ff5094baa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/UMLMatchingStrategy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLMatchingStrategy.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.part;

+package org.eclipse.papyrus.uml.diagram.clazz.part;

 

 import org.eclipse.emf.common.ui.URIEditorInput;

 import org.eclipse.ui.IEditorInput;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/UMLNewDiagramFileWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLNewDiagramFileWizard.java
index d0a075fa45a..ce29023d369 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/UMLNewDiagramFileWizard.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLNewDiagramFileWizard.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.part;

+package org.eclipse.papyrus.uml.diagram.clazz.part;

 

 import java.io.IOException;

 import java.util.LinkedList;

@@ -37,7 +37,7 @@ import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.jface.viewers.StructuredSelection;

 import org.eclipse.jface.wizard.Wizard;

 import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.ui.PartInitException;

 import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/UMLNodeDescriptor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLNodeDescriptor.java
index 038d3c50826..98a10461cdc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/UMLNodeDescriptor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLNodeDescriptor.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.part;

+package org.eclipse.papyrus.uml.diagram.clazz.part;

 

 import org.eclipse.emf.ecore.EObject;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/UMLPaletteFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLPaletteFactory.java
index edce1b736fc..19a1fae2a3a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/UMLPaletteFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLPaletteFactory.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.part;

+package org.eclipse.papyrus.uml.diagram.clazz.part;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -18,9 +18,9 @@ import java.util.List;
 import org.eclipse.gef.Tool;

 import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.diagram.common.service.AspectUnspecifiedTypeConnectionTool;

-import org.eclipse.papyrus.diagram.common.service.AspectUnspecifiedTypeCreationTool;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.common.service.AspectUnspecifiedTypeConnectionTool;

+import org.eclipse.papyrus.uml.diagram.common.service.AspectUnspecifiedTypeCreationTool;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/UMLUriEditorInputTester.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLUriEditorInputTester.java
index 298ff2e4212..b784a63d929 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/UMLUriEditorInputTester.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLUriEditorInputTester.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.part;

+package org.eclipse.papyrus.uml.diagram.clazz.part;

 

 import org.eclipse.core.expressions.PropertyTester;

 import org.eclipse.emf.common.ui.URIEditorInput;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/UMLVisualIDRegistry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLVisualIDRegistry.java
index b19a7d2f280..36e8221ddbe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/UMLVisualIDRegistry.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLVisualIDRegistry.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.part;

+package org.eclipse.papyrus.uml.diagram.clazz.part;

 

 import org.eclipse.core.runtime.Platform;

 import org.eclipse.emf.ecore.EAnnotation;

@@ -18,9 +18,9 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.*;

-import org.eclipse.papyrus.diagram.common.providers.BaseViewInfo;

-import org.eclipse.papyrus.diagram.common.providers.ViewInfo;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.*;

+import org.eclipse.papyrus.uml.diagram.common.providers.BaseViewInfo;

+import org.eclipse.papyrus.uml.diagram.common.providers.ViewInfo;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.UMLPackage;

 

@@ -36,7 +36,7 @@ public class UMLVisualIDRegistry {
 	/**

 	 * @generated

 	 */

-	private static final String DEBUG_KEY = "org.eclipse.papyrus.diagram.clazz/debug/visualID"; //$NON-NLS-1$

+	private static final String DEBUG_KEY = "org.eclipse.papyrus.uml.diagram.clazz/debug/visualID"; //$NON-NLS-1$

 

 	/**

 	 * @generated

@@ -49,7 +49,7 @@ public class UMLVisualIDRegistry {
 				return -1;

 			}

 		}

-		return org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry.getVisualID(view.getType());

+		return org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry.getVisualID(view.getType());

 	}

 

 	/**

@@ -109,13 +109,13 @@ public class UMLVisualIDRegistry {
 		if(domainElement == null) {

 			return -1;

 		}

-		String containerModelID = org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry.getModelID(containerView);

+		String containerModelID = org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry.getModelID(containerView);

 		if(!ModelEditPart.MODEL_ID.equals(containerModelID)) {

 			return -1;

 		}

 		int containerVisualID;

 		if(ModelEditPart.MODEL_ID.equals(containerModelID)) {

-			containerVisualID = org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry.getVisualID(containerView);

+			containerVisualID = org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry.getVisualID(containerView);

 		} else {

 			if(containerView instanceof Diagram) {

 				containerVisualID = ModelEditPart.VISUAL_ID;

@@ -866,13 +866,13 @@ public class UMLVisualIDRegistry {
 	 * @generated

 	 */

 	public static boolean canCreateNode(View containerView, int nodeVisualID) {

-		String containerModelID = org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry.getModelID(containerView);

+		String containerModelID = org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry.getModelID(containerView);

 		if(!ModelEditPart.MODEL_ID.equals(containerModelID)) {

 			return false;

 		}

 		int containerVisualID;

 		if(ModelEditPart.MODEL_ID.equals(containerModelID)) {

-			containerVisualID = org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry.getVisualID(containerView);

+			containerVisualID = org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry.getVisualID(containerView);

 		} else {

 			if(containerView instanceof Diagram) {

 				containerVisualID = ModelEditPart.VISUAL_ID;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/ValidateAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/ValidateAction.java
index abc2d7e40b1..a8bc4b9aaf2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/part/ValidateAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/ValidateAction.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.part;

+package org.eclipse.papyrus.uml.diagram.clazz.part;

 

 import java.lang.reflect.InvocationTargetException;

 import java.util.ArrayList;

@@ -41,8 +41,8 @@ import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.action.Action;

 import org.eclipse.jface.operation.IRunnableWithProgress;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLMarkerNavigationProvider;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLValidationProvider;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLMarkerNavigationProvider;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLValidationProvider;

 import org.eclipse.ui.IEditorPart;

 import org.eclipse.ui.IWorkbenchPage;

 import org.eclipse.ui.IWorkbenchPart;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/AbstractionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AbstractionPreferencePage.java
index 9880f65550b..3eb0ffe9a8c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/AbstractionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AbstractionPreferencePage.java
@@ -10,17 +10,17 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 

 /**

  * @generated

@@ -62,7 +62,7 @@ public class AbstractionPreferencePage extends AbstractPapyrusLinkPreferencePage
 	 */

 	private static TreeMap<String, String> getStaticLabelRole() {

 		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());

-		map.put("Name", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("Name", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png");//$NON-NLS-1$ //$NON-NLS-2$

 		map.put("Stereotype", "platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Stereotype.gif");//$NON-NLS-1$ //$NON-NLS-2$

 		return map;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/AssociationBranchLinkPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AssociationBranchLinkPreferencePage.java
index e20a01eb2d4..3a58f0ed682 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/AssociationBranchLinkPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AssociationBranchLinkPreferencePage.java
@@ -11,17 +11,17 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 

 /**

  * @generated

@@ -63,8 +63,8 @@ public class AssociationBranchLinkPreferencePage extends AbstractPapyrusLinkPref
 	 */

 	private static TreeMap<String, String> getStaticLabelRole() {

 		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());

-		map.put("TargetRole", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/role.gif");//$NON-NLS-1$ //$NON-NLS-2$

-		map.put("TargetMultiplicity", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/MultiplicityHandler.gif");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("TargetRole", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/role.gif");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("TargetMultiplicity", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/MultiplicityHandler.gif");//$NON-NLS-1$ //$NON-NLS-2$

 		return map;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/AssociationClassDashedLinkPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AssociationClassDashedLinkPreferencePage.java
index 0ed79232150..ba2cb4fdfab 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/AssociationClassDashedLinkPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AssociationClassDashedLinkPreferencePage.java
@@ -10,12 +10,12 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/AssociationClassLinkPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AssociationClassLinkPreferencePage.java
index 17370ab4db3..98f783b270b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/AssociationClassLinkPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AssociationClassLinkPreferencePage.java
@@ -10,17 +10,17 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 

 /**

  * @generated

@@ -62,8 +62,8 @@ public class AssociationClassLinkPreferencePage extends AbstractPapyrusLinkPrefe
 	 */

 	private static TreeMap<String, String> getStaticLabelRole() {

 		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());

-		map.put("SourceRole", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/role.gif");//$NON-NLS-1$ //$NON-NLS-2$

-		map.put("TargetRole", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/role.gif");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("SourceRole", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/role.gif");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("TargetRole", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/role.gif");//$NON-NLS-1$ //$NON-NLS-2$

 		return map;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/AssociationClassPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AssociationClassPreferencePage.java
index bed6bc41681..146da71f1f1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/AssociationClassPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AssociationClassPreferencePage.java
@@ -10,16 +10,16 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/AssociationLinkPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AssociationLinkPreferencePage.java
index 41adfb9a9ac..2712a0cbfd3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/AssociationLinkPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AssociationLinkPreferencePage.java
@@ -10,17 +10,17 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 

 /**

  * @generated

@@ -63,11 +63,11 @@ public class AssociationLinkPreferencePage extends AbstractPapyrusLinkPreference
 	private static TreeMap<String, String> getStaticLabelRole() {

 		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());

 		map.put("Stereotype", "platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Stereotype.gif");//$NON-NLS-1$ //$NON-NLS-2$

-		map.put("Name", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png");//$NON-NLS-1$ //$NON-NLS-2$

-		map.put("TargetRole", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/role.gif");//$NON-NLS-1$ //$NON-NLS-2$

-		map.put("SourceRole", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/role.gif");//$NON-NLS-1$ //$NON-NLS-2$

-		map.put("SourceMultiplicity", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/MultiplicityHandler.gif");//$NON-NLS-1$ //$NON-NLS-2$

-		map.put("TargetMultiplicity", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/MultiplicityHandler.gif");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("Name", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("TargetRole", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/role.gif");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("SourceRole", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/role.gif");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("SourceMultiplicity", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/MultiplicityHandler.gif");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("TargetMultiplicity", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/MultiplicityHandler.gif");//$NON-NLS-1$ //$NON-NLS-2$

 		return map;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/AssociationNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AssociationNodePreferencePage.java
index d4f92e617fc..e39766e20bf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/AssociationNodePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AssociationNodePreferencePage.java
@@ -10,13 +10,13 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/ClassPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ClassPreferencePage.java
index ce67056e7dc..115421eafa3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/ClassPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ClassPreferencePage.java
@@ -10,16 +10,16 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/ClassifierTemplateParameterPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ClassifierTemplateParameterPreferencePage.java
index d310402cfd4..8ba5bd7180b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/ClassifierTemplateParameterPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ClassifierTemplateParameterPreferencePage.java
@@ -10,13 +10,13 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/CommentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/CommentPreferencePage.java
index 30f04c882f0..ad511439742 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/CommentPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/CommentPreferencePage.java
@@ -10,13 +10,13 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/ComponentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ComponentPreferencePage.java
index 177e5a0812e..d7dd0beb319 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/ComponentPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ComponentPreferencePage.java
@@ -10,16 +10,16 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/ConnectableElementTemplateParameterPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ConnectableElementTemplateParameterPreferencePage.java
index 79d3cb0b449..35ce84ea3e4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/ConnectableElementTemplateParameterPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ConnectableElementTemplateParameterPreferencePage.java
@@ -10,13 +10,13 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/ConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ConstraintPreferencePage.java
index 7595a01ecb4..5de6d9fddde 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/ConstraintPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ConstraintPreferencePage.java
@@ -10,13 +10,13 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/ContainmentCirclePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ContainmentCirclePreferencePage.java
index d8f61741f97..24705955a58 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/ContainmentCirclePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ContainmentCirclePreferencePage.java
@@ -10,13 +10,13 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/ContainmentLinkPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ContainmentLinkPreferencePage.java
index ec17ad3ad0d..e6c22298763 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/ContainmentLinkPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ContainmentLinkPreferencePage.java
@@ -10,12 +10,12 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/ContainmentSubLinkPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ContainmentSubLinkPreferencePage.java
index dc62fa9ec18..da9bfd62f3a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/ContainmentSubLinkPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ContainmentSubLinkPreferencePage.java
@@ -10,12 +10,12 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/DataTypePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DataTypePreferencePage.java
index 6b17c7dcded..e1ab1eeff9a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/DataTypePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DataTypePreferencePage.java
@@ -10,16 +10,16 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/DefaultNamedElementPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DefaultNamedElementPreferencePage.java
index 5fc30b1b092..1c7561cde3a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/DefaultNamedElementPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DefaultNamedElementPreferencePage.java
@@ -10,13 +10,13 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/DependencyBranchLinkPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DependencyBranchLinkPreferencePage.java
index 674170380fd..0aef665497f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/DependencyBranchLinkPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DependencyBranchLinkPreferencePage.java
@@ -11,12 +11,12 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/DependencyLinkPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DependencyLinkPreferencePage.java
index e9dc1ca9cd1..c402d6c070a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/DependencyLinkPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DependencyLinkPreferencePage.java
@@ -10,17 +10,17 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 

 /**

  * @generated

@@ -62,7 +62,7 @@ public class DependencyLinkPreferencePage extends AbstractPapyrusLinkPreferenceP
 	 */

 	private static TreeMap<String, String> getStaticLabelRole() {

 		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());

-		map.put("Name", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("Name", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png");//$NON-NLS-1$ //$NON-NLS-2$

 		map.put("Stereotype", "platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Stereotype.gif");//$NON-NLS-1$ //$NON-NLS-2$

 		return map;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/DependencyNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DependencyNodePreferencePage.java
index bb511ecc8c3..5f3592ac179 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/DependencyNodePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DependencyNodePreferencePage.java
@@ -10,17 +10,17 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 

 /**

  * @generated

@@ -76,7 +76,7 @@ public class DependencyNodePreferencePage extends AbstractPapyrusNodePreferenceP
 	 */

 	private static TreeMap<String, String> getStaticLabelRole() {

 		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());

-		map.put("Name", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png");//$NON-NLS-1$

+		map.put("Name", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png");//$NON-NLS-1$

 		return map;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/DiagramAppearancePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramAppearancePreferencePage.java
index 06cc183461d..8aa91f1da15 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/DiagramAppearancePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramAppearancePreferencePage.java
@@ -10,10 +10,10 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import org.eclipse.gmf.runtime.diagram.ui.preferences.AppearancePreferencePage;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/DiagramConnectionsPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramConnectionsPreferencePage.java
index 1d7ddeb1e93..4314994e57e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/DiagramConnectionsPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramConnectionsPreferencePage.java
@@ -10,10 +10,10 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import org.eclipse.gmf.runtime.diagram.ui.preferences.ConnectionsPreferencePage;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/DiagramGeneralPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramGeneralPreferencePage.java
index c5c535509b6..7187397ed8a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/DiagramGeneralPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramGeneralPreferencePage.java
@@ -10,11 +10,11 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.DiagramPreferencePage;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/DiagramPreferenceInitializer.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramPreferenceInitializer.java
index 08a73322281..3f1941d2a92 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/DiagramPreferenceInitializer.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramPreferenceInitializer.java
@@ -10,11 +10,11 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/DiagramPrintingPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramPrintingPreferencePage.java
index 1d09449bb81..cdb47d59115 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/DiagramPrintingPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramPrintingPreferencePage.java
@@ -10,10 +10,10 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import org.eclipse.gmf.runtime.diagram.ui.preferences.PrintingPreferencePage;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/DiagramRulersAndGridPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramRulersAndGridPreferencePage.java
index a71f584ded8..88aa5b67c72 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/DiagramRulersAndGridPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramRulersAndGridPreferencePage.java
@@ -10,10 +10,10 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import org.eclipse.gmf.runtime.diagram.ui.preferences.RulerGridPreferencePage;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/DurationObservationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DurationObservationPreferencePage.java
index dc6606d3416..63e768e9242 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/DurationObservationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DurationObservationPreferencePage.java
@@ -10,17 +10,17 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 

 /**

  * @generated

@@ -76,7 +76,7 @@ public class DurationObservationPreferencePage extends AbstractPapyrusNodePrefer
 	 */

 	private static TreeMap<String, String> getStaticLabelRole() {

 		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());

-		map.put("Name", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png");//$NON-NLS-1$

+		map.put("Name", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png");//$NON-NLS-1$

 		map.put("Stereotype", "platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Stereotype.gif");//$NON-NLS-1$

 		return map;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/ElementImportPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ElementImportPreferencePage.java
index cf7791cf4b5..ea053e65d62 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/ElementImportPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ElementImportPreferencePage.java
@@ -10,17 +10,17 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 

 /**

  * @generated

@@ -62,7 +62,7 @@ public class ElementImportPreferencePage extends AbstractPapyrusLinkPreferencePa
 	 */

 	private static TreeMap<String, String> getStaticLabelRole() {

 		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());

-		map.put("Alias", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/alias.png");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("Alias", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/alias.png");//$NON-NLS-1$ //$NON-NLS-2$

 		map.put("Stereotype", "platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Stereotype.gif");//$NON-NLS-1$ //$NON-NLS-2$

 		return map;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/EnumerationLiteralPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/EnumerationLiteralPreferencePage.java
index 9d124f06ccf..9e1c22644b2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/EnumerationLiteralPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/EnumerationLiteralPreferencePage.java
@@ -10,13 +10,13 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/EnumerationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/EnumerationPreferencePage.java
index 4ccb0326bc9..b934faf4040 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/EnumerationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/EnumerationPreferencePage.java
@@ -10,16 +10,16 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/GeneralizationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/GeneralizationPreferencePage.java
index b63c96d25c1..d3c7cd58a6c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/GeneralizationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/GeneralizationPreferencePage.java
@@ -10,17 +10,17 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/GeneralizationSetPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/GeneralizationSetPreferencePage.java
index ed6d8491a13..8b8682cf07a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/GeneralizationSetPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/GeneralizationSetPreferencePage.java
@@ -10,17 +10,17 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/InstanceSpecificationLinkPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InstanceSpecificationLinkPreferencePage.java
index b020b119b10..4a8bcd4c33f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/InstanceSpecificationLinkPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InstanceSpecificationLinkPreferencePage.java
@@ -10,17 +10,17 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 

 /**

  * @generated

@@ -62,8 +62,8 @@ public class InstanceSpecificationLinkPreferencePage extends AbstractPapyrusLink
 	 */

 	private static TreeMap<String, String> getStaticLabelRole() {

 		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());

-		map.put("SourceRole", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/role.gif");//$NON-NLS-1$ //$NON-NLS-2$

-		map.put("TargetRole", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/role.gif");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("SourceRole", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/role.gif");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("TargetRole", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/role.gif");//$NON-NLS-1$ //$NON-NLS-2$

 		return map;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/InstanceSpecificationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InstanceSpecificationPreferencePage.java
index 62520249b57..2cac5697fc0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/InstanceSpecificationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InstanceSpecificationPreferencePage.java
@@ -10,16 +10,16 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/InterfacePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InterfacePreferencePage.java
index 5e82603ae6e..8d4ef53f3f2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/InterfacePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InterfacePreferencePage.java
@@ -10,16 +10,16 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/InterfaceRealizationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InterfaceRealizationPreferencePage.java
index 6ff09b430bb..e1836ef9dca 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/InterfaceRealizationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InterfaceRealizationPreferencePage.java
@@ -10,17 +10,17 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 

 /**

  * @generated

@@ -63,7 +63,7 @@ public class InterfaceRealizationPreferencePage extends AbstractPapyrusLinkPrefe
 	private static TreeMap<String, String> getStaticLabelRole() {

 		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());

 		map.put("Stereotype", "platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Stereotype.gif");//$NON-NLS-1$ //$NON-NLS-2$

-		map.put("Name", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("Name", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png");//$NON-NLS-1$ //$NON-NLS-2$

 		return map;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/ModelPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ModelPreferencePage.java
index 880b282a402..fbc87682daf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/ModelPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ModelPreferencePage.java
@@ -10,16 +10,16 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/OperationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/OperationPreferencePage.java
index 87818ee94d6..8a4288f8f99 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/OperationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/OperationPreferencePage.java
@@ -10,13 +10,13 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/OperationTemplateParameterPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/OperationTemplateParameterPreferencePage.java
index 126de379e11..656acd842e3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/OperationTemplateParameterPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/OperationTemplateParameterPreferencePage.java
@@ -10,13 +10,13 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/PackageImportPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PackageImportPreferencePage.java
index 623bd107142..d42afe9f662 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/PackageImportPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PackageImportPreferencePage.java
@@ -10,17 +10,17 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/PackageMergePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PackageMergePreferencePage.java
index 39d28385b1d..fb2db9e727c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/PackageMergePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PackageMergePreferencePage.java
@@ -10,17 +10,17 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/PackagePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PackagePreferencePage.java
index 9d07eccec0b..b1471635a66 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/PackagePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PackagePreferencePage.java
@@ -10,16 +10,16 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/PrimitiveTypePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PrimitiveTypePreferencePage.java
index 12faa4477f3..205080241c3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/PrimitiveTypePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PrimitiveTypePreferencePage.java
@@ -10,13 +10,13 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/ProfileApplicationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ProfileApplicationPreferencePage.java
index 0486d9494d8..9f048af6e9b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/ProfileApplicationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ProfileApplicationPreferencePage.java
@@ -10,12 +10,12 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/PropertyPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PropertyPreferencePage.java
index c88ef4defe6..0726d7a1b52 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/PropertyPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PropertyPreferencePage.java
@@ -10,13 +10,13 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/RealizationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/RealizationPreferencePage.java
index 678002835b9..06b42e4870f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/RealizationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/RealizationPreferencePage.java
@@ -10,17 +10,17 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 

 /**

  * @generated

@@ -63,7 +63,7 @@ public class RealizationPreferencePage extends AbstractPapyrusLinkPreferencePage
 	private static TreeMap<String, String> getStaticLabelRole() {

 		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());

 		map.put("Stereotype", "platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Stereotype.gif");//$NON-NLS-1$ //$NON-NLS-2$

-		map.put("Name", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("Name", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png");//$NON-NLS-1$ //$NON-NLS-2$

 		return map;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/ReceptionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ReceptionPreferencePage.java
index 6b6b9c24a06..44d8cfaae8f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/ReceptionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ReceptionPreferencePage.java
@@ -10,13 +10,13 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/RedefinableTemplateSignaturePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/RedefinableTemplateSignaturePreferencePage.java
index 8a3aba3019c..cb408385310 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/RedefinableTemplateSignaturePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/RedefinableTemplateSignaturePreferencePage.java
@@ -10,16 +10,16 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/ShapeNamedElementPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ShapeNamedElementPreferencePage.java
index c511d20cfb2..85a7006b0d8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/ShapeNamedElementPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ShapeNamedElementPreferencePage.java
@@ -10,17 +10,17 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 

 /**

  * @generated

@@ -76,7 +76,7 @@ public class ShapeNamedElementPreferencePage extends AbstractPapyrusNodePreferen
 	 */

 	private static TreeMap<String, String> getStaticLabelRole() {

 		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());

-		map.put("Name", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png");//$NON-NLS-1$

+		map.put("Name", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png");//$NON-NLS-1$

 		return map;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/ShortCutDiagramPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ShortCutDiagramPreferencePage.java
index c201980dd5d..56338b757b3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/ShortCutDiagramPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ShortCutDiagramPreferencePage.java
@@ -10,17 +10,17 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 

 /**

  * @generated

@@ -76,7 +76,7 @@ public class ShortCutDiagramPreferencePage extends AbstractPapyrusNodePreference
 	 */

 	private static TreeMap<String, String> getStaticLabelRole() {

 		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());

-		map.put("Name", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png");//$NON-NLS-1$

+		map.put("Name", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png");//$NON-NLS-1$

 		return map;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/SignalPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/SignalPreferencePage.java
index f3cde8057a7..7bd1d497602 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/SignalPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/SignalPreferencePage.java
@@ -10,16 +10,16 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/SlotPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/SlotPreferencePage.java
index a3c4c1de193..5608147f5db 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/SlotPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/SlotPreferencePage.java
@@ -10,13 +10,13 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/SubstitutionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/SubstitutionPreferencePage.java
index 415645b0a9e..c0e3b7f6459 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/SubstitutionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/SubstitutionPreferencePage.java
@@ -10,17 +10,17 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 

 /**

  * @generated

@@ -63,7 +63,7 @@ public class SubstitutionPreferencePage extends AbstractPapyrusLinkPreferencePag
 	private static TreeMap<String, String> getStaticLabelRole() {

 		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());

 		map.put("Stereotype", "platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Stereotype.gif");//$NON-NLS-1$ //$NON-NLS-2$

-		map.put("Name", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("Name", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png");//$NON-NLS-1$ //$NON-NLS-2$

 		return map;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/TemplateBindingPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/TemplateBindingPreferencePage.java
index b5935eabcbb..f40b3f9fcbf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/TemplateBindingPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/TemplateBindingPreferencePage.java
@@ -10,17 +10,17 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/TemplateParameterPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/TemplateParameterPreferencePage.java
index 7b1202e37e7..895aafbb772 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/TemplateParameterPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/TemplateParameterPreferencePage.java
@@ -10,13 +10,13 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/TemplateSignaturePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/TemplateSignaturePreferencePage.java
index 02cb6091c40..7efa09b5c6e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/TemplateSignaturePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/TemplateSignaturePreferencePage.java
@@ -10,16 +10,16 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/TimeObservationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/TimeObservationPreferencePage.java
index a1e61aed236..1a75fbffed1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/TimeObservationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/TimeObservationPreferencePage.java
@@ -10,17 +10,17 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 

 /**

  * @generated

@@ -76,7 +76,7 @@ public class TimeObservationPreferencePage extends AbstractPapyrusNodePreference
 	 */

 	private static TreeMap<String, String> getStaticLabelRole() {

 		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());

-		map.put("Name", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png");//$NON-NLS-1$

+		map.put("Name", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png");//$NON-NLS-1$

 		map.put("Stereotype", "platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Stereotype.gif");//$NON-NLS-1$

 		return map;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/UsagePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/UsagePreferencePage.java
index 6f276bfbb48..9f8f1a0608e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/preferences/UsagePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/UsagePreferencePage.java
@@ -10,17 +10,17 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.preferences;

+package org.eclipse.papyrus.uml.diagram.clazz.preferences;

 

 import java.util.Map;

 import java.util.TreeMap;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 

 /**

  * @generated

@@ -62,7 +62,7 @@ public class UsagePreferencePage extends AbstractPapyrusLinkPreferencePage {
 	 */

 	private static TreeMap<String, String> getStaticLabelRole() {

 		TreeMap<String, String> map = new TreeMap<String, String>(new StringComparator());

-		map.put("Name", "platform:/plugin/org.eclipse.papyrus.diagram.common/icons/label_role/name.png");//$NON-NLS-1$ //$NON-NLS-2$

+		map.put("Name", "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png");//$NON-NLS-1$ //$NON-NLS-2$

 		map.put("Stereotype", "platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Stereotype.gif");//$NON-NLS-1$ //$NON-NLS-2$

 		return map;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/providers/ElementInitializers.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/ElementInitializers.java
index 0763a38355a..58f4ba495b0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/providers/ElementInitializers.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/ElementInitializers.java
@@ -10,11 +10,11 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.providers;

+package org.eclipse.papyrus.uml.diagram.clazz.providers;

 

-import org.eclipse.papyrus.diagram.clazz.expressions.UMLOCLFactory;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.common.helper.NamedElementHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.expressions.UMLOCLFactory;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.common.helper.NamedElementHelper;

 import org.eclipse.uml2.uml.Abstraction;

 import org.eclipse.uml2.uml.Association;

 import org.eclipse.uml2.uml.AssociationClass;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/providers/UMLEditPartProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLEditPartProvider.java
index 3f83f5cf79d..12f27d4aa90 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/providers/UMLEditPartProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLEditPartProvider.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.providers;

+package org.eclipse.papyrus.uml.diagram.clazz.providers;

 

 import java.lang.ref.WeakReference;

 

@@ -22,9 +22,9 @@ import org.eclipse.gmf.runtime.diagram.ui.services.editpart.AbstractEditPartProv
 import org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateGraphicEditPartOperation;

 import org.eclipse.gmf.runtime.diagram.ui.services.editpart.IEditPartOperation;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UMLEditPartFactory;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UMLEditPartFactory;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/providers/UMLElementTypes.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLElementTypes.java
index ff5866ec975..faa512588cb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/providers/UMLElementTypes.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLElementTypes.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.providers;

+package org.eclipse.papyrus.uml.diagram.clazz.providers;

 

 import java.util.HashSet;

 import java.util.IdentityHashMap;

@@ -27,87 +27,87 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.jface.resource.ImageDescriptor;

 import org.eclipse.jface.resource.ImageRegistry;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassDashedLinkEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationNodeEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ClassEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ClassEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ClassifierTemplateParameterEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectableElementTemplateParameterEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ContainmentCircleEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ContainmentLinkEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ContainmentSubLinkEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DefaultNamedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyBranchEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyNodeEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationLiteralEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.GeneralizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.GeneralizationSetEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.InstanceSpecificationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.InstanceSpecificationEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.InstanceSpecificationLinkEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceRealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPartTN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.NestedClassForClassEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.NestedClassForComponentEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.NestedClassForInterfaceEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.OperationForClassEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.OperationForComponentEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.OperationForDataTypeEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.OperationForInterfaceEditpart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.OperationTemplateParameterEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageMergeEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ProfileApplicationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PropertyForClassEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PropertyForComponentEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PropertyForInterfaceEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PropertyForSignalEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PropertyforDataTypeEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ReceptionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ShapeNamedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ShortCutDiagramEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SignalEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SignalEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SlotEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SubstitutionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TemplateBindingEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TemplateParameterEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TemplateSignatureEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassDashedLinkEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassLinkEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassifierTemplateParameterEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectableElementTemplateParameterEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorDurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectorTimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContainmentCircleEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContainmentLinkEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContainmentSubLinkEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DefaultNamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationLiteralEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.GeneralizationSetEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationLinkEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartTN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForClassEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForInterfaceEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForClassEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForDataTypeEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForInterfaceEditpart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationTemplateParameterEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageMergeEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ProfileApplicationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForClassEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForInterfaceEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForSignalEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyforDataTypeEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ReceptionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ShapeNamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ShortCutDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SlotEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateParameterEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateSignatureEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.uml2.uml.UMLPackage;

 

@@ -140,402 +140,402 @@ public class UMLElementTypes {
 	/**

 	 * @generated

 	 */

-	public static final IElementType Package_1000 = getElementType("org.eclipse.papyrus.diagram.clazz.Package_1000"); //$NON-NLS-1$

+	public static final IElementType Package_1000 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Package_1000"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Dependency_2014 = getElementType("org.eclipse.papyrus.diagram.clazz.Dependency_2014"); //$NON-NLS-1$

+	public static final IElementType Dependency_2014 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Dependency_2014"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType AssociationClass_2013 = getElementType("org.eclipse.papyrus.diagram.clazz.AssociationClass_2013"); //$NON-NLS-1$

+	public static final IElementType AssociationClass_2013 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.AssociationClass_2013"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Association_2015 = getElementType("org.eclipse.papyrus.diagram.clazz.Association_2015"); //$NON-NLS-1$

+	public static final IElementType Association_2015 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Association_2015"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType InstanceSpecification_2001 = getElementType("org.eclipse.papyrus.diagram.clazz.InstanceSpecification_2001"); //$NON-NLS-1$

+	public static final IElementType InstanceSpecification_2001 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecification_2001"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Component_2002 = getElementType("org.eclipse.papyrus.diagram.clazz.Component_2002"); //$NON-NLS-1$

+	public static final IElementType Component_2002 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Component_2002"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Signal_2003 = getElementType("org.eclipse.papyrus.diagram.clazz.Signal_2003"); //$NON-NLS-1$

+	public static final IElementType Signal_2003 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Signal_2003"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Interface_2004 = getElementType("org.eclipse.papyrus.diagram.clazz.Interface_2004"); //$NON-NLS-1$

+	public static final IElementType Interface_2004 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Interface_2004"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Model_2005 = getElementType("org.eclipse.papyrus.diagram.clazz.Model_2005"); //$NON-NLS-1$

+	public static final IElementType Model_2005 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Model_2005"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Enumeration_2006 = getElementType("org.eclipse.papyrus.diagram.clazz.Enumeration_2006"); //$NON-NLS-1$

+	public static final IElementType Enumeration_2006 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Enumeration_2006"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Package_2007 = getElementType("org.eclipse.papyrus.diagram.clazz.Package_2007"); //$NON-NLS-1$

+	public static final IElementType Package_2007 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Package_2007"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Class_2008 = getElementType("org.eclipse.papyrus.diagram.clazz.Class_2008"); //$NON-NLS-1$

+	public static final IElementType Class_2008 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Class_2008"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType PrimitiveType_2009 = getElementType("org.eclipse.papyrus.diagram.clazz.PrimitiveType_2009"); //$NON-NLS-1$

+	public static final IElementType PrimitiveType_2009 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_2009"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType DataType_2010 = getElementType("org.eclipse.papyrus.diagram.clazz.DataType_2010"); //$NON-NLS-1$

+	public static final IElementType DataType_2010 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.DataType_2010"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Constraint_2011 = getElementType("org.eclipse.papyrus.diagram.clazz.Constraint_2011"); //$NON-NLS-1$

+	public static final IElementType Constraint_2011 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Constraint_2011"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Comment_2012 = getElementType("org.eclipse.papyrus.diagram.clazz.Comment_2012"); //$NON-NLS-1$

+	public static final IElementType Comment_2012 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Comment_2012"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Diagram_2016 = getElementType("org.eclipse.papyrus.diagram.clazz.Diagram_2016"); //$NON-NLS-1$

+	public static final IElementType Diagram_2016 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Diagram_2016"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType DurationObservation_2095 = getElementType("org.eclipse.papyrus.diagram.clazz.DurationObservation_2095"); //$NON-NLS-1$

+	public static final IElementType DurationObservation_2095 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.DurationObservation_2095"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType TimeObservation_2096 = getElementType("org.eclipse.papyrus.diagram.clazz.TimeObservation_2096"); //$NON-NLS-1$

+	public static final IElementType TimeObservation_2096 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.TimeObservation_2096"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType NamedElement_2097 = getElementType("org.eclipse.papyrus.diagram.clazz.NamedElement_2097"); //$NON-NLS-1$

+	public static final IElementType NamedElement_2097 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.NamedElement_2097"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType NamedElement_2098 = getElementType("org.eclipse.papyrus.diagram.clazz.NamedElement_2098"); //$NON-NLS-1$

+	public static final IElementType NamedElement_2098 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.NamedElement_2098"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Property_3012 = getElementType("org.eclipse.papyrus.diagram.clazz.Property_3012"); //$NON-NLS-1$

+	public static final IElementType Property_3012 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Property_3012"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Property_3002 = getElementType("org.eclipse.papyrus.diagram.clazz.Property_3002"); //$NON-NLS-1$

+	public static final IElementType Property_3002 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Property_3002"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Property_3005 = getElementType("org.eclipse.papyrus.diagram.clazz.Property_3005"); //$NON-NLS-1$

+	public static final IElementType Property_3005 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Property_3005"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Property_3006 = getElementType("org.eclipse.papyrus.diagram.clazz.Property_3006"); //$NON-NLS-1$

+	public static final IElementType Property_3006 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Property_3006"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Property_3018 = getElementType("org.eclipse.papyrus.diagram.clazz.Property_3018"); //$NON-NLS-1$

+	public static final IElementType Property_3018 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Property_3018"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Class_3014 = getElementType("org.eclipse.papyrus.diagram.clazz.Class_3014"); //$NON-NLS-1$

+	public static final IElementType Class_3014 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Class_3014"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Class_3004 = getElementType("org.eclipse.papyrus.diagram.clazz.Class_3004"); //$NON-NLS-1$

+	public static final IElementType Class_3004 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Class_3004"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Class_3008 = getElementType("org.eclipse.papyrus.diagram.clazz.Class_3008"); //$NON-NLS-1$

+	public static final IElementType Class_3008 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Class_3008"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Operation_3013 = getElementType("org.eclipse.papyrus.diagram.clazz.Operation_3013"); //$NON-NLS-1$

+	public static final IElementType Operation_3013 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Operation_3013"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Operation_3003 = getElementType("org.eclipse.papyrus.diagram.clazz.Operation_3003"); //$NON-NLS-1$

+	public static final IElementType Operation_3003 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Operation_3003"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Operation_3007 = getElementType("org.eclipse.papyrus.diagram.clazz.Operation_3007"); //$NON-NLS-1$

+	public static final IElementType Operation_3007 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Operation_3007"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Operation_3019 = getElementType("org.eclipse.papyrus.diagram.clazz.Operation_3019"); //$NON-NLS-1$

+	public static final IElementType Operation_3019 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Operation_3019"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType ConnectableElementTemplateParameter_3034 = getElementType("org.eclipse.papyrus.diagram.clazz.ConnectableElementTemplateParameter_3034"); //$NON-NLS-1$

+	public static final IElementType ConnectableElementTemplateParameter_3034 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.ConnectableElementTemplateParameter_3034"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType OperationTemplateParameter_3035 = getElementType("org.eclipse.papyrus.diagram.clazz.OperationTemplateParameter_3035"); //$NON-NLS-1$

+	public static final IElementType OperationTemplateParameter_3035 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.OperationTemplateParameter_3035"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType ClassifierTemplateParameter_3031 = getElementType("org.eclipse.papyrus.diagram.clazz.ClassifierTemplateParameter_3031"); //$NON-NLS-1$

+	public static final IElementType ClassifierTemplateParameter_3031 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.ClassifierTemplateParameter_3031"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType TemplateParameter_3016 = getElementType("org.eclipse.papyrus.diagram.clazz.TemplateParameter_3016"); //$NON-NLS-1$

+	public static final IElementType TemplateParameter_3016 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.TemplateParameter_3016"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType EnumerationLiteral_3017 = getElementType("org.eclipse.papyrus.diagram.clazz.EnumerationLiteral_3017"); //$NON-NLS-1$

+	public static final IElementType EnumerationLiteral_3017 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.EnumerationLiteral_3017"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Reception_3011 = getElementType("org.eclipse.papyrus.diagram.clazz.Reception_3011"); //$NON-NLS-1$

+	public static final IElementType Reception_3011 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Reception_3011"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Slot_3030 = getElementType("org.eclipse.papyrus.diagram.clazz.Slot_3030"); //$NON-NLS-1$

+	public static final IElementType Slot_3030 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Slot_3030"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType RedefinableTemplateSignature_3015 = getElementType("org.eclipse.papyrus.diagram.clazz.RedefinableTemplateSignature_3015"); //$NON-NLS-1$

+	public static final IElementType RedefinableTemplateSignature_3015 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.RedefinableTemplateSignature_3015"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Node_3032 = getElementType("org.eclipse.papyrus.diagram.clazz.ContainmentCircle_3032"); //$NON-NLS-1$

+	public static final IElementType Node_3032 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.ContainmentCircle_3032"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType TemplateSignature_3033 = getElementType("org.eclipse.papyrus.diagram.clazz.TemplateSignature_3033"); //$NON-NLS-1$

+	public static final IElementType TemplateSignature_3033 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.TemplateSignature_3033"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType InstanceSpecification_3020 = getElementType("org.eclipse.papyrus.diagram.clazz.InstanceSpecification_3020"); //$NON-NLS-1$

+	public static final IElementType InstanceSpecification_3020 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecification_3020"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Component_3021 = getElementType("org.eclipse.papyrus.diagram.clazz.Component_3021"); //$NON-NLS-1$

+	public static final IElementType Component_3021 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Component_3021"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Signal_3022 = getElementType("org.eclipse.papyrus.diagram.clazz.Signal_3022"); //$NON-NLS-1$

+	public static final IElementType Signal_3022 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Signal_3022"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Interface_3023 = getElementType("org.eclipse.papyrus.diagram.clazz.Interface_3023"); //$NON-NLS-1$

+	public static final IElementType Interface_3023 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Interface_3023"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Model_3024 = getElementType("org.eclipse.papyrus.diagram.clazz.Model_3024"); //$NON-NLS-1$

+	public static final IElementType Model_3024 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Model_3024"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Enumeration_3025 = getElementType("org.eclipse.papyrus.diagram.clazz.Enumeration_3025"); //$NON-NLS-1$

+	public static final IElementType Enumeration_3025 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3025"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Package_3009 = getElementType("org.eclipse.papyrus.diagram.clazz.Package_3009"); //$NON-NLS-1$

+	public static final IElementType Package_3009 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Package_3009"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Class_3010 = getElementType("org.eclipse.papyrus.diagram.clazz.Class_3010"); //$NON-NLS-1$

+	public static final IElementType Class_3010 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Class_3010"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType PrimitiveType_3026 = getElementType("org.eclipse.papyrus.diagram.clazz.PrimitiveType_3026"); //$NON-NLS-1$

+	public static final IElementType PrimitiveType_3026 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3026"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType DataType_3027 = getElementType("org.eclipse.papyrus.diagram.clazz.DataType_3027"); //$NON-NLS-1$

+	public static final IElementType DataType_3027 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.DataType_3027"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Comment_3028 = getElementType("org.eclipse.papyrus.diagram.clazz.Comment_3028"); //$NON-NLS-1$

+	public static final IElementType Comment_3028 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Comment_3028"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Constraint_3029 = getElementType("org.eclipse.papyrus.diagram.clazz.Constraint_3029"); //$NON-NLS-1$

+	public static final IElementType Constraint_3029 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Constraint_3029"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Link_4016 = getElementType("org.eclipse.papyrus.diagram.clazz.Link_4016"); //$NON-NLS-1$

+	public static final IElementType Link_4016 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Link_4016"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType AssociationClass_4017 = getElementType("org.eclipse.papyrus.diagram.clazz.AssociationClass_4017"); //$NON-NLS-1$

+	public static final IElementType AssociationClass_4017 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.AssociationClass_4017"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Association_4001 = getElementType("org.eclipse.papyrus.diagram.clazz.Association_4001"); //$NON-NLS-1$

+	public static final IElementType Association_4001 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Association_4001"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Association_4019 = getElementType("org.eclipse.papyrus.diagram.clazz.Association_4019"); //$NON-NLS-1$

+	public static final IElementType Association_4019 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Association_4019"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Generalization_4002 = getElementType("org.eclipse.papyrus.diagram.clazz.Generalization_4002"); //$NON-NLS-1$

+	public static final IElementType Generalization_4002 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Generalization_4002"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType InterfaceRealization_4003 = getElementType("org.eclipse.papyrus.diagram.clazz.InterfaceRealization_4003"); //$NON-NLS-1$

+	public static final IElementType InterfaceRealization_4003 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.InterfaceRealization_4003"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Substitution_4004 = getElementType("org.eclipse.papyrus.diagram.clazz.Substitution_4004"); //$NON-NLS-1$

+	public static final IElementType Substitution_4004 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Substitution_4004"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Realization_4005 = getElementType("org.eclipse.papyrus.diagram.clazz.Realization_4005"); //$NON-NLS-1$

+	public static final IElementType Realization_4005 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Realization_4005"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Abstraction_4006 = getElementType("org.eclipse.papyrus.diagram.clazz.Abstraction_4006"); //$NON-NLS-1$

+	public static final IElementType Abstraction_4006 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Abstraction_4006"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Usage_4007 = getElementType("org.eclipse.papyrus.diagram.clazz.Usage_4007"); //$NON-NLS-1$

+	public static final IElementType Usage_4007 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Usage_4007"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Dependency_4008 = getElementType("org.eclipse.papyrus.diagram.clazz.Dependency_4008"); //$NON-NLS-1$

+	public static final IElementType Dependency_4008 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Dependency_4008"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Dependency_4018 = getElementType("org.eclipse.papyrus.diagram.clazz.Dependency_4018"); //$NON-NLS-1$

+	public static final IElementType Dependency_4018 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.Dependency_4018"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType ElementImport_4009 = getElementType("org.eclipse.papyrus.diagram.clazz.ElementImport_4009"); //$NON-NLS-1$

+	public static final IElementType ElementImport_4009 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.ElementImport_4009"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType PackageImport_4010 = getElementType("org.eclipse.papyrus.diagram.clazz.PackageImport_4010"); //$NON-NLS-1$

+	public static final IElementType PackageImport_4010 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.PackageImport_4010"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType PackageMerge_4011 = getElementType("org.eclipse.papyrus.diagram.clazz.PackageMerge_4011"); //$NON-NLS-1$

+	public static final IElementType PackageMerge_4011 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.PackageMerge_4011"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType ProfileApplication_4012 = getElementType("org.eclipse.papyrus.diagram.clazz.ProfileApplication_4012"); //$NON-NLS-1$

+	public static final IElementType ProfileApplication_4012 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.ProfileApplication_4012"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType CommentAnnotatedElement_4013 = getElementType("org.eclipse.papyrus.diagram.clazz.CommentAnnotatedElement_4013"); //$NON-NLS-1$

+	public static final IElementType CommentAnnotatedElement_4013 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.CommentAnnotatedElement_4013"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType ConstraintConstrainedElement_4014 = getElementType("org.eclipse.papyrus.diagram.clazz.ConstraintConstrainedElement_4014"); //$NON-NLS-1$

+	public static final IElementType ConstraintConstrainedElement_4014 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.ConstraintConstrainedElement_4014"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType TemplateBinding_4015 = getElementType("org.eclipse.papyrus.diagram.clazz.TemplateBinding_4015"); //$NON-NLS-1$

+	public static final IElementType TemplateBinding_4015 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.TemplateBinding_4015"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType GeneralizationSet_4020 = getElementType("org.eclipse.papyrus.diagram.clazz.GeneralizationSet_4020"); //$NON-NLS-1$

+	public static final IElementType GeneralizationSet_4020 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.GeneralizationSet_4020"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType InstanceSpecification_4021 = getElementType("org.eclipse.papyrus.diagram.clazz.InstanceSpecificationLink_4021"); //$NON-NLS-1$

+	public static final IElementType InstanceSpecification_4021 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecificationLink_4021"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Link_4022 = getElementType("org.eclipse.papyrus.diagram.clazz.AddedLink_4022"); //$NON-NLS-1$

+	public static final IElementType Link_4022 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.AddedLink_4022"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType Link_4023 = getElementType("org.eclipse.papyrus.diagram.clazz.ContainmentLink_4023"); //$NON-NLS-1$

+	public static final IElementType Link_4023 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.ContainmentLink_4023"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType TimeObservationEvent_4024 = getElementType("org.eclipse.papyrus.diagram.clazz.TimeObservationEvent_4024"); //$NON-NLS-1$

+	public static final IElementType TimeObservationEvent_4024 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.TimeObservationEvent_4024"); //$NON-NLS-1$

 

 	/**

 	 * @generated

 	 */

-	public static final IElementType DurationObservationEvent_4025 = getElementType("org.eclipse.papyrus.diagram.clazz.DurationObservationEvent_4025"); //$NON-NLS-1$

+	public static final IElementType DurationObservationEvent_4025 = getElementType("org.eclipse.papyrus.uml.diagram.clazz.DurationObservationEvent_4025"); //$NON-NLS-1$

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/providers/UMLIconProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLIconProvider.java
index 13d610e8e63..2b272cbfc95 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/providers/UMLIconProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLIconProvider.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.providers;

+package org.eclipse.papyrus.uml.diagram.clazz.providers;

 

 import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/providers/UMLMarkerNavigationProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLMarkerNavigationProvider.java
index e4845f4d944..a0c2fffaafd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/providers/UMLMarkerNavigationProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLMarkerNavigationProvider.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.providers;

+package org.eclipse.papyrus.uml.diagram.clazz.providers;

 

 import java.util.Arrays;

 import java.util.Map;

@@ -24,8 +24,8 @@ import org.eclipse.emf.ecore.EObject;
 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.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorUtil;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorUtil;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/providers/UMLModelingAssistantProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLModelingAssistantProvider.java
index 3f87bd70911..c6c6fe38729 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/providers/UMLModelingAssistantProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLModelingAssistantProvider.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.providers;

+package org.eclipse.papyrus.uml.diagram.clazz.providers;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -29,46 +29,46 @@ import org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.ModelingAssista
 import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.jface.viewers.ILabelProvider;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationNodeEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ClassEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ClassEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DefaultNamedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyNodeEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DurationObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.InstanceSpecificationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.InstanceSpecificationEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPartTN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelPackageableElementCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelPackageableElementCompartmentEditPartTN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackagePackageableElementCompartmentEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackagePackageableElementCompartmentEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ShapeNamedElementEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SignalEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SignalEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TemplateSignatureEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TimeObservationEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.Messages;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DefaultNamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DurationObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartTN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelPackageableElementCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelPackageableElementCompartmentEditPartTN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackagePackageableElementCompartmentEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackagePackageableElementCompartmentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RedefinableTemplateSignatureEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ShapeNamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateSignatureEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TimeObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.Messages;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.swt.widgets.Display;

 import org.eclipse.swt.widgets.Shell;

 import org.eclipse.ui.dialogs.ElementListSelectionDialog;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/providers/UMLParserProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLParserProvider.java
index 6ea5ae9e149..bf554747080 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/providers/UMLParserProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLParserProvider.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.providers;

+package org.eclipse.papyrus.uml.diagram.clazz.providers;

 

 import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.emf.ecore.EAttribute;

@@ -24,102 +24,102 @@ import org.eclipse.gmf.runtime.common.ui.services.parser.ParserService;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.emf.ui.services.parser.ParserHintAdapter;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.custom.parsers.GeneralizationSetConstraintParser;

-import org.eclipse.papyrus.diagram.clazz.custom.parsers.RoleInstanceSpecificationLinkParser;

-import org.eclipse.papyrus.diagram.clazz.custom.parsers.SlotParser;

-import org.eclipse.papyrus.diagram.clazz.custom.parsers.TemplateBindingParser;

-import org.eclipse.papyrus.diagram.clazz.custom.parsers.TemplateParameterParser;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AbstractionNameEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotypeAbstractionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotypeAssociationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotypeDependencyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotypeElementImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotypeGeneralizationSetLabelEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotypeInterfaceRealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotypePackageImportEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotypePackageMergeEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotypeRealizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotypeSubstitutionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotypeTemplateBindingEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotypeUsageEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AppliedStereotyperGeneralizationEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationBranchMutliplicityEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassNameEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassRoleSourceEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationClassRoleTargetEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationMultiplicitySourceEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationMultiplicityTargetEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationNameEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationSourceNameEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.AssociationTargetNameEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.BindingSubstitutionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ClassNameEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ClassNameEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ClassifierTemplateParameterEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentBodyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.CommentBodyEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentNameEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ComponentNameEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConnectableElementTemplateParameterEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintBodyEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintBodyEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintLabelEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintNameEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ConstraintNameEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeNameEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DataTypeNameEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DefaultNamedElementNameEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DependencyNameEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DiagramNameEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DurationObservationNameEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.DurationObservationStereotypeLabelEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ElementImportAliasEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationLiteralEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationNameEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationNameEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.InstanceSpecificationNameEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.InstanceSpecificationNameEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceNameEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceNameEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.InterfaceRealizationName2EditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelNameEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelNameEditPartTN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.MultiDependencyLabelEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.NestedClassForClassEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.NestedClassForComponentEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.NestedClassForInterfaceEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.OperationForComponentEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.OperationForDataTypeEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.OperationForInterfaceEditpart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.OperationTemplateParameterEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageNameEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PackageNameEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeNameEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PrimitiveTypeNameEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PropertyForComponentEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PropertyForInterfaceEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PropertyForSignalEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.PropertyforDataTypeEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.RealizationNameEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ReceptionEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ShapeNamedElementNameEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SignalNameEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SignalNameEditPartCN;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SlotEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SourceISLinkLabelEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.SubstitutionNameEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TargetISLinkLabelEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TemplateParameterEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TimeObservationNameEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.TimeObservationStereotypeLabelEditPart;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.UsageNameEditPart;

-import org.eclipse.papyrus.diagram.clazz.parsers.MessageFormatParser;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.common.parser.CommentParser;

-import org.eclipse.papyrus.diagram.common.parser.ConstraintParser;

-import org.eclipse.papyrus.diagram.common.parser.ShortcutDiagramParser;

-import org.eclipse.papyrus.diagram.common.parser.packageimport.PackageImportVisibilityParser;

-import org.eclipse.papyrus.diagram.common.parser.stereotype.AppliedStereotypeParser;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.parsers.GeneralizationSetConstraintParser;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.parsers.RoleInstanceSpecificationLinkParser;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.parsers.SlotParser;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.parsers.TemplateBindingParser;

+import org.eclipse.papyrus.uml.diagram.clazz.custom.parsers.TemplateParameterParser;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionNameEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeAbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeAssociationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeDependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeElementImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeGeneralizationSetLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeInterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypePackageImportEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypePackageMergeEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeSubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeTemplateBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeUsageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotyperGeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchMutliplicityEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassNameEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassRoleSourceEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassRoleTargetEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationMultiplicitySourceEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationMultiplicityTargetEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationNameEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationSourceNameEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationTargetNameEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.BindingSubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNameEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassifierTemplateParameterEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentBodyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentBodyEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentNameEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConnectableElementTemplateParameterEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintBodyEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintBodyEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintNameEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeNameEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DefaultNamedElementNameEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyNameEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DiagramNameEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DurationObservationNameEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DurationObservationStereotypeLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportAliasEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationLiteralEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationNameEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationNameEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceNameEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceRealizationName2EditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelNameEditPartTN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.MultiDependencyLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForClassEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.NestedClassForInterfaceEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForDataTypeEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationForInterfaceEditpart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.OperationTemplateParameterEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageNameEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeNameEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForComponentEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForInterfaceEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyForSignalEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PropertyforDataTypeEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationNameEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ReceptionEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ShapeNamedElementNameEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalNameEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalNameEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SlotEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SourceISLinkLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionNameEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TargetISLinkLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TemplateParameterEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TimeObservationNameEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TimeObservationStereotypeLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageNameEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.parsers.MessageFormatParser;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.common.parser.CommentParser;

+import org.eclipse.papyrus.uml.diagram.common.parser.ConstraintParser;

+import org.eclipse.papyrus.uml.diagram.common.parser.ShortcutDiagramParser;

+import org.eclipse.papyrus.uml.diagram.common.parser.packageimport.PackageImportVisibilityParser;

+import org.eclipse.papyrus.uml.diagram.common.parser.stereotype.AppliedStereotypeParser;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/providers/UMLValidationDecoratorProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLValidationDecoratorProvider.java
index 6481c5deb71..033a011c482 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/providers/UMLValidationDecoratorProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLValidationDecoratorProvider.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.providers;

+package org.eclipse.papyrus.uml.diagram.clazz.providers;

 

 import org.eclipse.gef.EditDomain;

 import org.eclipse.gef.EditPart;

@@ -23,10 +23,10 @@ import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorProvider;
 import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget;

 import org.eclipse.gmf.runtime.notation.Edge;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.common.providers.ValidationDecoratorProvider;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.common.providers.ValidationDecoratorProvider;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/providers/UMLValidationProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLValidationProvider.java
index 2976701e6b7..cacde9fbb16 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/providers/UMLValidationProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLValidationProvider.java
@@ -10,13 +10,13 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.providers;

+package org.eclipse.papyrus.uml.diagram.clazz.providers;

 

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.ModelEditPart;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditorPlugin;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 

 /**

  * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLViewProvider.java
index b4c71b877b3..054c3a9b680 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLViewProvider.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.providers;

+package org.eclipse.papyrus.uml.diagram.clazz.providers;

 

 import java.util.ArrayList;

 

@@ -51,12 +51,12 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.papyrus.diagram.clazz.edit.parts.*;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.extendedtypes.types.IExtendedHintedElementType;

 import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;

 import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.*;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.FontData;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/sheet/UMLPropertySection.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/sheet/UMLPropertySection.java
index e38f00d32b3..de7a267e24d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/sheet/UMLPropertySection.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/sheet/UMLPropertySection.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.sheet;

+package org.eclipse.papyrus.uml.diagram.clazz.sheet;

 

 import java.util.ArrayList;

 import java.util.Iterator;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/sheet/UMLSheetLabelProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/sheet/UMLSheetLabelProvider.java
index c229a2a638d..5022591aa28 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/diagram/clazz/sheet/UMLSheetLabelProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/sheet/UMLSheetLabelProvider.java
@@ -10,7 +10,7 @@
  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  */

-package org.eclipse.papyrus.diagram.clazz.sheet;

+package org.eclipse.papyrus.uml.diagram.clazz.sheet;

 

 import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

@@ -18,9 +18,9 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.viewers.BaseLabelProvider;

 import org.eclipse.jface.viewers.ILabelProvider;

 import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.diagram.clazz.navigator.UMLNavigatorGroup;

-import org.eclipse.papyrus.diagram.clazz.part.UMLVisualIDRegistry;

-import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorGroup;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.swt.graphics.Image;

 

 /**