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

108 files changed, 337 insertions, 336 deletions

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/Activator.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/Activator.java
index 40491a7175d..2fb8101b969 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/Activator.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/Activator.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile;

+package org.eclipse.papyrus.uml.profile;

 

 import org.eclipse.core.runtime.IStatus;

 import org.eclipse.core.runtime.Status;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/FontManager.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/FontManager.java
index 11d1fb09f8b..b1cf209cc9c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/FontManager.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/FontManager.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile;

+package org.eclipse.papyrus.uml.profile;

 

 

 

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ImageManager.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ImageManager.java
index 5a442199144..917761707ae 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ImageManager.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ImageManager.java
@@ -12,11 +12,10 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile;

+package org.eclipse.papyrus.uml.profile;

 

 import org.eclipse.jface.resource.ImageDescriptor;

 import org.eclipse.jface.resource.ImageRegistry;

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

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.ui.plugin.AbstractUIPlugin;

 

@@ -181,7 +180,7 @@ public class ImageManager {
 		ImageRegistry registry = Activator.getDefault().getImageRegistry();

 		Image image = registry.get(key);

 		if(image == null) {

-			ImageDescriptor desc = AbstractUIPlugin.imageDescriptorFromPlugin(org.eclipse.papyrus.profile.Activator.PLUGIN_ID, key);

+			ImageDescriptor desc = AbstractUIPlugin.imageDescriptorFromPlugin(org.eclipse.papyrus.uml.profile.Activator.PLUGIN_ID, key);

 			registry.put(key, desc);

 			image = registry.get(key);

 		}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/Message.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/Message.java
index 18e9f864c2e..7762ddb25da 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/Message.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/Message.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile;
+package org.eclipse.papyrus.uml.profile;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/constraints/PropertyHasDefaultValueConstraint.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/constraints/PropertyHasDefaultValueConstraint.java
index d8f36d051a0..fb690251520 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/constraints/PropertyHasDefaultValueConstraint.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/constraints/PropertyHasDefaultValueConstraint.java
@@ -12,12 +12,12 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.constraints;
+package org.eclipse.papyrus.uml.profile.constraints;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.emf.validation.AbstractModelConstraint;
 import org.eclipse.emf.validation.IValidationContext;
-import org.eclipse.papyrus.profile.utils.ProfileConstraintUtils;
+import org.eclipse.papyrus.uml.profile.utils.ProfileConstraintUtils;
 import org.eclipse.uml2.uml.Property;
 
 public class PropertyHasDefaultValueConstraint extends AbstractModelConstraint {
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/constraints/PropertyHasNameConstraint.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/constraints/PropertyHasNameConstraint.java
index 4cd0dc265e2..221b41c2144 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/constraints/PropertyHasNameConstraint.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/constraints/PropertyHasNameConstraint.java
@@ -12,12 +12,12 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.constraints;
+package org.eclipse.papyrus.uml.profile.constraints;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.emf.validation.AbstractModelConstraint;
 import org.eclipse.emf.validation.IValidationContext;
-import org.eclipse.papyrus.profile.utils.ProfileConstraintUtils;
+import org.eclipse.papyrus.uml.profile.utils.ProfileConstraintUtils;
 import org.eclipse.uml2.uml.Property;
 
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/constraints/PropertyHasTypeConstraint.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/constraints/PropertyHasTypeConstraint.java
index 8b668abcc5b..2cf0ef29c2b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/constraints/PropertyHasTypeConstraint.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/constraints/PropertyHasTypeConstraint.java
@@ -12,12 +12,12 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.constraints;
+package org.eclipse.papyrus.uml.profile.constraints;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.emf.validation.AbstractModelConstraint;
 import org.eclipse.emf.validation.IValidationContext;
-import org.eclipse.papyrus.profile.utils.ProfileConstraintUtils;
+import org.eclipse.papyrus.uml.profile.utils.ProfileConstraintUtils;
 import org.eclipse.uml2.uml.Property;
 
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/constraints/PropertyHasUniqueNameConstraint.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/constraints/PropertyHasUniqueNameConstraint.java
index 872a8bf9a90..accb9f66fd5 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/constraints/PropertyHasUniqueNameConstraint.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/constraints/PropertyHasUniqueNameConstraint.java
@@ -12,12 +12,12 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.constraints;
+package org.eclipse.papyrus.uml.profile.constraints;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.emf.validation.AbstractModelConstraint;
 import org.eclipse.emf.validation.IValidationContext;
-import org.eclipse.papyrus.profile.utils.ProfileConstraintUtils;
+import org.eclipse.papyrus.uml.profile.utils.ProfileConstraintUtils;
 import org.eclipse.uml2.uml.Property;
 
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/constraints/PropertyMultiplicityLowerConstraint.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/constraints/PropertyMultiplicityLowerConstraint.java
index 5ae7a1d4c47..ee6a1f2baaa 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/constraints/PropertyMultiplicityLowerConstraint.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/constraints/PropertyMultiplicityLowerConstraint.java
@@ -12,12 +12,12 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.constraints;
+package org.eclipse.papyrus.uml.profile.constraints;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.emf.validation.AbstractModelConstraint;
 import org.eclipse.emf.validation.IValidationContext;
-import org.eclipse.papyrus.profile.utils.ProfileConstraintUtils;
+import org.eclipse.papyrus.uml.profile.utils.ProfileConstraintUtils;
 import org.eclipse.uml2.uml.Property;
 
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/definition/IPapyrusVersionConstants.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/definition/IPapyrusVersionConstants.java
index 805c738677e..8be61716d26 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/definition/IPapyrusVersionConstants.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/definition/IPapyrusVersionConstants.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.definition;

+package org.eclipse.papyrus.uml.profile.definition;

 

 /**

  * Constant fields for papyrus profile version

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/definition/PapyrusDefinitionAnnotation.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/definition/PapyrusDefinitionAnnotation.java
index b5204e4eba7..c571742010b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/definition/PapyrusDefinitionAnnotation.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/definition/PapyrusDefinitionAnnotation.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.definition;

+package org.eclipse.papyrus.uml.profile.definition;

 

 import org.eclipse.emf.ecore.EAnnotation;

 import org.eclipse.emf.ecore.EcoreFactory;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/definition/ProfileRedefinition.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/definition/ProfileRedefinition.java
index 3a928241238..52be39f2b06 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/definition/ProfileRedefinition.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/definition/ProfileRedefinition.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.definition;

+package org.eclipse.papyrus.uml.profile.definition;

 

 import java.util.ArrayList;

 import java.util.Iterator;

@@ -26,7 +26,7 @@ import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.EReference;

 import org.eclipse.emf.ecore.EcoreFactory;

-import org.eclipse.papyrus.profile.Message;

+import org.eclipse.papyrus.uml.profile.Message;

 import org.eclipse.uml2.uml.Classifier;

 import org.eclipse.uml2.uml.DataType;

 import org.eclipse.uml2.uml.Enumeration;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/definition/Version.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/definition/Version.java
index 94ce0c4e9f5..941250609e3 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/definition/Version.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/definition/Version.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.definition;

+package org.eclipse.papyrus.uml.profile.definition;

 

 import java.util.NoSuchElementException;

 import java.util.StringTokenizer;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/filter/AppliedProfileSectionFilter.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/filter/AppliedProfileSectionFilter.java
index 40c9427686e..6e48cbc8b7c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/filter/AppliedProfileSectionFilter.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/filter/AppliedProfileSectionFilter.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.filter;

+package org.eclipse.papyrus.uml.profile.filter;

 

 import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.emf.ecore.EObject;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/filter/AppliedStereotypeSectionFilter.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/filter/AppliedStereotypeSectionFilter.java
index 78ade6551c5..81cca93f62f 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/filter/AppliedStereotypeSectionFilter.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/filter/AppliedStereotypeSectionFilter.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Obeo - initial API and implementation

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

-package org.eclipse.papyrus.profile.filter;

+package org.eclipse.papyrus.uml.profile.filter;

 

 import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.emf.ecore.EObject;

@@ -18,7 +18,6 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.properties.filters.ShapeEditPartPropertySectionFilter;

 import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Package;

 

 /**

  * This filter is used to check if stereotypes are applicable on the selected Element.

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/filter/CompartmentEditPartPropertySectionFilter.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/filter/CompartmentEditPartPropertySectionFilter.java
index 055cd904895..c73b2a09a2b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/filter/CompartmentEditPartPropertySectionFilter.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/filter/CompartmentEditPartPropertySectionFilter.java
@@ -9,7 +9,7 @@
  *    Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation 

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

 

-package org.eclipse.papyrus.profile.filter;

+package org.eclipse.papyrus.uml.profile.filter;

 

 import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;

 import org.eclipse.jface.viewers.IFilter;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/preference/ProfileDefinitionPreferenceConstants.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/preference/ProfileDefinitionPreferenceConstants.java
index 1fb42fd6c6b..84810769392 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/preference/ProfileDefinitionPreferenceConstants.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/preference/ProfileDefinitionPreferenceConstants.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.preference;

+package org.eclipse.papyrus.uml.profile.preference;

 

 import org.eclipse.jface.preference.IPreferenceStore;

 

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/preference/ProfilePreferenceConstants.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/preference/ProfilePreferenceConstants.java
index 63de126f9ac..8af263eecfb 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/preference/ProfilePreferenceConstants.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/preference/ProfilePreferenceConstants.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.preference;

+package org.eclipse.papyrus.uml.profile.preference;

 

 import org.eclipse.jface.preference.IPreferenceStore;

 

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/DisplayedProfileElementLabelProvider.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/DisplayedProfileElementLabelProvider.java
index 47167080b84..2e5c39a40ed 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/DisplayedProfileElementLabelProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/DisplayedProfileElementLabelProvider.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.tree;
+package org.eclipse.papyrus.uml.profile.tree;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -21,22 +21,22 @@ import org.eclipse.emf.common.util.Enumerator;
 import org.eclipse.emf.ecore.EEnumLiteral;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.papyrus.profile.ImageManager;
-import org.eclipse.papyrus.profile.Message;
-import org.eclipse.papyrus.profile.tree.objects.AppliedStereotypePropertyTreeObject;
-import org.eclipse.papyrus.profile.tree.objects.AppliedStereotypeTreeObject;
-import org.eclipse.papyrus.profile.tree.objects.BooleanValueTreeObject;
-import org.eclipse.papyrus.profile.tree.objects.DataTypeValueTreeObject;
-import org.eclipse.papyrus.profile.tree.objects.EnumerationValueTreeObject;
-import org.eclipse.papyrus.profile.tree.objects.IntegerValueTreeObject;
-import org.eclipse.papyrus.profile.tree.objects.MetaclassValueTreeObject;
-import org.eclipse.papyrus.profile.tree.objects.PrimitiveTypeValueTreeObject;
-import org.eclipse.papyrus.profile.tree.objects.StereotypeValueTreeObject;
-import org.eclipse.papyrus.profile.tree.objects.StringValueTreeObject;
-import org.eclipse.papyrus.profile.tree.objects.UnlimitedNaturalValueTreeObject;
-import org.eclipse.papyrus.profile.tree.objects.UserPrimitiveTypeValueTreeObject;
-import org.eclipse.papyrus.profile.tree.objects.ValueTreeObject;
-import org.eclipse.papyrus.profile.utils.Util;
+import org.eclipse.papyrus.uml.profile.ImageManager;
+import org.eclipse.papyrus.uml.profile.Message;
+import org.eclipse.papyrus.uml.profile.tree.objects.AppliedStereotypePropertyTreeObject;
+import org.eclipse.papyrus.uml.profile.tree.objects.AppliedStereotypeTreeObject;
+import org.eclipse.papyrus.uml.profile.tree.objects.BooleanValueTreeObject;
+import org.eclipse.papyrus.uml.profile.tree.objects.DataTypeValueTreeObject;
+import org.eclipse.papyrus.uml.profile.tree.objects.EnumerationValueTreeObject;
+import org.eclipse.papyrus.uml.profile.tree.objects.IntegerValueTreeObject;
+import org.eclipse.papyrus.uml.profile.tree.objects.MetaclassValueTreeObject;
+import org.eclipse.papyrus.uml.profile.tree.objects.PrimitiveTypeValueTreeObject;
+import org.eclipse.papyrus.uml.profile.tree.objects.StereotypeValueTreeObject;
+import org.eclipse.papyrus.uml.profile.tree.objects.StringValueTreeObject;
+import org.eclipse.papyrus.uml.profile.tree.objects.UnlimitedNaturalValueTreeObject;
+import org.eclipse.papyrus.uml.profile.tree.objects.UserPrimitiveTypeValueTreeObject;
+import org.eclipse.papyrus.uml.profile.tree.objects.ValueTreeObject;
+import org.eclipse.papyrus.uml.profile.utils.Util;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.Element;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/ProfileElementContentProvider.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/ProfileElementContentProvider.java
index a26a29192e3..15b4b1dac5b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/ProfileElementContentProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/ProfileElementContentProvider.java
@@ -12,15 +12,15 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.tree;
+package org.eclipse.papyrus.uml.profile.tree;
 
 import org.eclipse.jface.viewers.IContentProvider;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.papyrus.profile.tree.objects.ParentTreeObject;
-import org.eclipse.papyrus.profile.tree.objects.StereotypedElementTreeObject;
-import org.eclipse.papyrus.profile.tree.objects.TreeObject;
+import org.eclipse.papyrus.uml.profile.tree.objects.ParentTreeObject;
+import org.eclipse.papyrus.uml.profile.tree.objects.StereotypedElementTreeObject;
+import org.eclipse.papyrus.uml.profile.tree.objects.TreeObject;
 
 // TODO: Auto-generated Javadoc
 /**
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/ProfileElementLabelProvider.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/ProfileElementLabelProvider.java
index e5838d54a99..2dfe7cc3014 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/ProfileElementLabelProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/ProfileElementLabelProvider.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.tree;
+package org.eclipse.papyrus.uml.profile.tree;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -21,22 +21,22 @@ import org.eclipse.emf.common.util.Enumerator;
 import org.eclipse.emf.ecore.EEnumLiteral;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.papyrus.profile.ImageManager;
-import org.eclipse.papyrus.profile.Message;
-import org.eclipse.papyrus.profile.tree.objects.AppliedStereotypePropertyTreeObject;
-import org.eclipse.papyrus.profile.tree.objects.AppliedStereotypeTreeObject;
-import org.eclipse.papyrus.profile.tree.objects.BooleanValueTreeObject;
-import org.eclipse.papyrus.profile.tree.objects.DataTypeValueTreeObject;
-import org.eclipse.papyrus.profile.tree.objects.EnumerationValueTreeObject;
-import org.eclipse.papyrus.profile.tree.objects.IntegerValueTreeObject;
-import org.eclipse.papyrus.profile.tree.objects.MetaclassValueTreeObject;
-import org.eclipse.papyrus.profile.tree.objects.PrimitiveTypeValueTreeObject;
-import org.eclipse.papyrus.profile.tree.objects.StereotypeValueTreeObject;
-import org.eclipse.papyrus.profile.tree.objects.StringValueTreeObject;
-import org.eclipse.papyrus.profile.tree.objects.UnlimitedNaturalValueTreeObject;
-import org.eclipse.papyrus.profile.tree.objects.UserPrimitiveTypeValueTreeObject;
-import org.eclipse.papyrus.profile.tree.objects.ValueTreeObject;
-import org.eclipse.papyrus.profile.utils.Util;
+import org.eclipse.papyrus.uml.profile.ImageManager;
+import org.eclipse.papyrus.uml.profile.Message;
+import org.eclipse.papyrus.uml.profile.tree.objects.AppliedStereotypePropertyTreeObject;
+import org.eclipse.papyrus.uml.profile.tree.objects.AppliedStereotypeTreeObject;
+import org.eclipse.papyrus.uml.profile.tree.objects.BooleanValueTreeObject;
+import org.eclipse.papyrus.uml.profile.tree.objects.DataTypeValueTreeObject;
+import org.eclipse.papyrus.uml.profile.tree.objects.EnumerationValueTreeObject;
+import org.eclipse.papyrus.uml.profile.tree.objects.IntegerValueTreeObject;
+import org.eclipse.papyrus.uml.profile.tree.objects.MetaclassValueTreeObject;
+import org.eclipse.papyrus.uml.profile.tree.objects.PrimitiveTypeValueTreeObject;
+import org.eclipse.papyrus.uml.profile.tree.objects.StereotypeValueTreeObject;
+import org.eclipse.papyrus.uml.profile.tree.objects.StringValueTreeObject;
+import org.eclipse.papyrus.uml.profile.tree.objects.UnlimitedNaturalValueTreeObject;
+import org.eclipse.papyrus.uml.profile.tree.objects.UserPrimitiveTypeValueTreeObject;
+import org.eclipse.papyrus.uml.profile.tree.objects.ValueTreeObject;
+import org.eclipse.papyrus.uml.profile.utils.Util;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.Element;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/ProfileElementTreeViewer.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/ProfileElementTreeViewer.java
index 2ccd2a38542..1cb91f44497 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/ProfileElementTreeViewer.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/ProfileElementTreeViewer.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.tree;
+package org.eclipse.papyrus.uml.profile.tree;
 
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/ProfileElementTreeViewerFilter.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/ProfileElementTreeViewerFilter.java
index 79e726f4eee..280b67d8e70 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/ProfileElementTreeViewerFilter.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/ProfileElementTreeViewerFilter.java
@@ -12,12 +12,12 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.tree;
+package org.eclipse.papyrus.uml.profile.tree;
 
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.papyrus.profile.tree.objects.AppliedStereotypePropertyTreeObject;
-import org.eclipse.papyrus.profile.tree.objects.AppliedStereotypeTreeObject;
+import org.eclipse.papyrus.uml.profile.tree.objects.AppliedStereotypePropertyTreeObject;
+import org.eclipse.papyrus.uml.profile.tree.objects.AppliedStereotypeTreeObject;
 
 
 // TODO: Auto-generated Javadoc
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/PropertyValueTreeViewer.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/PropertyValueTreeViewer.java
index 750019dedb9..58c5bae65e6 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/PropertyValueTreeViewer.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/PropertyValueTreeViewer.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.tree;
+package org.eclipse.papyrus.uml.profile.tree;
 
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/objects/AppliedStereotypePropertyTreeObject.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/objects/AppliedStereotypePropertyTreeObject.java
index d19245fcbff..9191299cba6 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/objects/AppliedStereotypePropertyTreeObject.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/objects/AppliedStereotypePropertyTreeObject.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.tree.objects;
+package org.eclipse.papyrus.uml.profile.tree.objects;
 
 import java.util.Iterator;
 import java.util.List;
@@ -22,8 +22,8 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.transaction.RecordingCommand;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.core.utils.EditorUtils;
-import org.eclipse.papyrus.profile.utils.Util;
+import org.eclipse.papyrus.infra.core.utils.EditorUtils;
+import org.eclipse.papyrus.uml.profile.utils.Util;
 import org.eclipse.uml2.uml.DataType;
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.Enumeration;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/objects/AppliedStereotypeTreeObject.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/objects/AppliedStereotypeTreeObject.java
index 546c1c712af..a8378a0a465 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/objects/AppliedStereotypeTreeObject.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/objects/AppliedStereotypeTreeObject.java
@@ -12,14 +12,14 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.tree.objects;
+package org.eclipse.papyrus.uml.profile.tree.objects;
 
 import java.util.Iterator;
 
 import org.eclipse.emf.common.util.BasicEList;
 import org.eclipse.emf.common.util.EList;
-import org.eclipse.papyrus.profile.Message;
-import org.eclipse.papyrus.profile.utils.Util;
+import org.eclipse.papyrus.uml.profile.Message;
+import org.eclipse.papyrus.uml.profile.utils.Util;
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.Property;
 import org.eclipse.uml2.uml.Stereotype;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/objects/BooleanValueTreeObject.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/objects/BooleanValueTreeObject.java
index d9fc2c4fa6d..a515ad5314a 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/objects/BooleanValueTreeObject.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/objects/BooleanValueTreeObject.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.tree.objects;
+package org.eclipse.papyrus.uml.profile.tree.objects;
 
 
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/objects/CompositeValueTreeObject.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/objects/CompositeValueTreeObject.java
index c981865e394..c6739bb4ba2 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/objects/CompositeValueTreeObject.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/objects/CompositeValueTreeObject.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.tree.objects;
+package org.eclipse.papyrus.uml.profile.tree.objects;
 
 
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/objects/DataTypeValueTreeObject.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/objects/DataTypeValueTreeObject.java
index f3dbb1355e2..aea63966ddc 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/objects/DataTypeValueTreeObject.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/objects/DataTypeValueTreeObject.java
@@ -12,10 +12,10 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.tree.objects;

+package org.eclipse.papyrus.uml.profile.tree.objects;

 

-import org.eclipse.papyrus.profile.ui.dialogs.InputDialogPrimitiveType;

-import org.eclipse.papyrus.profile.utils.Util;

+import org.eclipse.papyrus.uml.profile.ui.dialogs.InputDialogPrimitiveType;

+import org.eclipse.papyrus.uml.profile.utils.Util;

 import org.eclipse.swt.widgets.Shell;

 import org.eclipse.uml2.uml.Property;

 import org.eclipse.uml2.uml.Type;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/objects/EnumerationValueTreeObject.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/objects/EnumerationValueTreeObject.java
index f65e0a27605..3c1ffade79e 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/objects/EnumerationValueTreeObject.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/objects/EnumerationValueTreeObject.java
@@ -12,9 +12,9 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.tree.objects;
+package org.eclipse.papyrus.uml.profile.tree.objects;
 
-import org.eclipse.papyrus.profile.ui.dialogs.InputDialogEnumeration;
+import org.eclipse.papyrus.uml.profile.ui.dialogs.InputDialogEnumeration;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.uml2.uml.Enumeration;
 import org.eclipse.uml2.uml.EnumerationLiteral;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/objects/IntegerValueTreeObject.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/objects/IntegerValueTreeObject.java
index 2cb603321a0..f1a7cd4ce6c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/objects/IntegerValueTreeObject.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/objects/IntegerValueTreeObject.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.tree.objects;
+package org.eclipse.papyrus.uml.profile.tree.objects;
 
 
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/objects/MetaclassValueTreeObject.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/objects/MetaclassValueTreeObject.java
index 9a8d5ec5859..31caeaa08d5 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/objects/MetaclassValueTreeObject.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/objects/MetaclassValueTreeObject.java
@@ -12,15 +12,14 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.tree.objects;
+package org.eclipse.papyrus.uml.profile.tree.objects;
 
 import java.util.ArrayList;
 
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.profile.Message;
-import org.eclipse.papyrus.profile.tree.ProfileElementLabelProvider;
-import org.eclipse.papyrus.profile.ui.dialogs.ComboSelectionDialog;
-import org.eclipse.papyrus.profile.utils.Util;
+import org.eclipse.papyrus.uml.profile.Message;
+import org.eclipse.papyrus.uml.profile.tree.ProfileElementLabelProvider;
+import org.eclipse.papyrus.uml.profile.ui.dialogs.ComboSelectionDialog;
+import org.eclipse.papyrus.uml.profile.utils.Util;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.Property;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/objects/ParentTreeObject.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/objects/ParentTreeObject.java
index 754df4a13d3..47d7cdbbf47 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/objects/ParentTreeObject.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/objects/ParentTreeObject.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.tree.objects;
+package org.eclipse.papyrus.uml.profile.tree.objects;
 
 import java.util.ArrayList;
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/objects/PrimitiveTypeValueTreeObject.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/objects/PrimitiveTypeValueTreeObject.java
index 483821114df..f3df521061f 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/objects/PrimitiveTypeValueTreeObject.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/objects/PrimitiveTypeValueTreeObject.java
@@ -12,10 +12,10 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.tree.objects;
+package org.eclipse.papyrus.uml.profile.tree.objects;
 
-import org.eclipse.papyrus.profile.ui.dialogs.InputDialogPrimitiveType;
-import org.eclipse.papyrus.profile.utils.Util;
+import org.eclipse.papyrus.uml.profile.ui.dialogs.InputDialogPrimitiveType;
+import org.eclipse.papyrus.uml.profile.utils.Util;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.uml2.uml.PrimitiveType;
 import org.eclipse.uml2.uml.Property;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/objects/StereotypeValueTreeObject.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/objects/StereotypeValueTreeObject.java
index d33756fa297..106cb80b283 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/objects/StereotypeValueTreeObject.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/objects/StereotypeValueTreeObject.java
@@ -13,17 +13,17 @@
  *  Ansgar Radermacher (CEA LIST) Ansgar.Radermacher@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.tree.objects;
+package org.eclipse.papyrus.uml.profile.tree.objects;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.profile.Message;
-import org.eclipse.papyrus.profile.tree.ProfileElementLabelProvider;
-import org.eclipse.papyrus.profile.ui.dialogs.ComboSelectionDialog;
-import org.eclipse.papyrus.profile.utils.Util;
+import org.eclipse.papyrus.uml.profile.Message;
+import org.eclipse.papyrus.uml.profile.tree.ProfileElementLabelProvider;
+import org.eclipse.papyrus.uml.profile.ui.dialogs.ComboSelectionDialog;
+import org.eclipse.papyrus.uml.profile.utils.Util;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.Property;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/objects/StereotypedElementTreeObject.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/objects/StereotypedElementTreeObject.java
index 5f46880974a..d2565dc0644 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/objects/StereotypedElementTreeObject.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/objects/StereotypedElementTreeObject.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.tree.objects;
+package org.eclipse.papyrus.uml.profile.tree.objects;
 
 import java.util.Iterator;
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/objects/StringValueTreeObject.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/objects/StringValueTreeObject.java
index ccf758dcb97..367b64a56d5 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/objects/StringValueTreeObject.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/objects/StringValueTreeObject.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.tree.objects;
+package org.eclipse.papyrus.uml.profile.tree.objects;
 
 
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/objects/TreeObject.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/objects/TreeObject.java
index 36ae378900b..84719cacd13 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/objects/TreeObject.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/objects/TreeObject.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.tree.objects;
+package org.eclipse.papyrus.uml.profile.tree.objects;
 
 
 // TODO: Auto-generated Javadoc
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/objects/UnlimitedNaturalValueTreeObject.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/objects/UnlimitedNaturalValueTreeObject.java
index 101fcc6e5d9..cf15036ae4b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/objects/UnlimitedNaturalValueTreeObject.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/objects/UnlimitedNaturalValueTreeObject.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.tree.objects;
+package org.eclipse.papyrus.uml.profile.tree.objects;
 
 
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/objects/UserPrimitiveTypeValueTreeObject.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/objects/UserPrimitiveTypeValueTreeObject.java
index 791b2f6262a..d7d7b620f05 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/objects/UserPrimitiveTypeValueTreeObject.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/objects/UserPrimitiveTypeValueTreeObject.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.tree.objects;
+package org.eclipse.papyrus.uml.profile.tree.objects;
 
 
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/objects/ValueTreeObject.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/objects/ValueTreeObject.java
index 178fc87ed66..c97e05cc461 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/tree/objects/ValueTreeObject.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/tree/objects/ValueTreeObject.java
@@ -13,12 +13,12 @@
  *  Ansgar Radermacher (CEA LIST) Ansgar.Radermacher@cea.fr - modification, documentation, clean-up
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.tree.objects;
+package org.eclipse.papyrus.uml.profile.tree.objects;
 
 import java.util.ArrayList;
 
 import org.eclipse.emf.common.util.EList;
-import org.eclipse.papyrus.profile.utils.Util;
+import org.eclipse.papyrus.uml.profile.utils.Util;
 import org.eclipse.uml2.uml.DataType;
 import org.eclipse.uml2.uml.Enumeration;
 import org.eclipse.uml2.uml.PrimitiveType;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/actions/AbstractPackageImportAction.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/actions/AbstractPackageImportAction.java
index 33068f290b0..f91328809b5 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/actions/AbstractPackageImportAction.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/actions/AbstractPackageImportAction.java
@@ -13,7 +13,7 @@
  *  Ansgar Radermacher (CEA LIST) Ansgar.Radermacher@cea.fr - minor modifications

  *

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

-package org.eclipse.papyrus.profile.ui.actions;

+package org.eclipse.papyrus.uml.profile.ui.actions;

 

 import org.eclipse.emf.common.command.CommandStack;

 import org.eclipse.emf.edit.domain.EditingDomain;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/actions/AbstractViewActionDelegate.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/actions/AbstractViewActionDelegate.java
index f9edf9701e9..9c18040619f 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/actions/AbstractViewActionDelegate.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/actions/AbstractViewActionDelegate.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.ui.actions;
+package org.eclipse.papyrus.uml.profile.ui.actions;
 
 import java.util.Iterator;
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/actions/ImportFromFile.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/actions/ImportFromFile.java
index 82d35d1dd4a..2e460e6d31c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/actions/ImportFromFile.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/actions/ImportFromFile.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.ui.actions;
+package org.eclipse.papyrus.uml.profile.ui.actions;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -24,8 +24,8 @@ import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.uml2.utils.Util;
-import org.eclipse.papyrus.profile.ui.dialogs.PackageImportTreeSelectionDialog;
+import org.eclipse.papyrus.uml.extensionpoints.utils.Util;
+import org.eclipse.papyrus.uml.profile.ui.dialogs.PackageImportTreeSelectionDialog;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.dialogs.ResourceSelectionDialog;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/actions/ImportLibrariesFromRepositoryAction.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/actions/ImportLibrariesFromRepositoryAction.java
index 8ea276dc60c..bac57d49d37 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/actions/ImportLibrariesFromRepositoryAction.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/actions/ImportLibrariesFromRepositoryAction.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2008 CEA LIST.
  *
- *    
+ * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.ui.actions;
+package org.eclipse.papyrus.uml.profile.ui.actions;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -26,10 +26,10 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.uml2.library.FilteredRegisteredLibrariesSelectionDialog;
-import org.eclipse.papyrus.extensionpoints.uml2.library.RegisteredLibrary;
-import org.eclipse.papyrus.extensionpoints.uml2.utils.Util;
-import org.eclipse.papyrus.profile.ui.dialogs.PackageImportTreeSelectionDialog;
+import org.eclipse.papyrus.uml.extensionpoints.library.FilteredRegisteredLibrariesSelectionDialog;
+import org.eclipse.papyrus.uml.extensionpoints.library.RegisteredLibrary;
+import org.eclipse.papyrus.uml.extensionpoints.utils.Util;
+import org.eclipse.papyrus.uml.profile.ui.dialogs.PackageImportTreeSelectionDialog;
 import org.eclipse.papyrus.uml.tools.utils.PackageUtil;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PlatformUI;
@@ -72,12 +72,12 @@ public class ImportLibrariesFromRepositoryAction extends AbstractPackageImportAc
 		ResourceSet resourceSet = Util.getResourceSet(selectedElement);
 
 		for(int i = 0; i < librariesToImport.length; i++) {
-			RegisteredLibrary currentLibrary = (RegisteredLibrary)(librariesToImport[i]);
+			RegisteredLibrary currentLibrary = (librariesToImport[i]);
 			URI modelUri = currentLibrary.uri;
 
 			Resource modelResource = resourceSet.getResource(modelUri, true);
 			PackageImportTreeSelectionDialog eisd = new PackageImportTreeSelectionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
-					((Package)modelResource.getContents().get(0)));
+				((Package)modelResource.getContents().get(0)));
 			int ret = eisd.open();
 
 			if(ret == Window.OK) {
@@ -111,7 +111,7 @@ public class ImportLibrariesFromRepositoryAction extends AbstractPackageImportAc
 				libraries.add(registeredLibrary);
 			}
 		}
-		return (RegisteredLibrary[])libraries.toArray(new RegisteredLibrary[libraries.size()]);
+		return libraries.toArray(new RegisteredLibrary[libraries.size()]);
 	}
 
 	/**
@@ -166,12 +166,12 @@ public class ImportLibrariesFromRepositoryAction extends AbstractPackageImportAc
 					// Open Registered ModelLibrary selection dialog
 					FilteredRegisteredLibrariesSelectionDialog dialog =
 						new FilteredRegisteredLibrariesSelectionDialog(shell, true,
-								allLibraries, getImportedLibraries());
+							allLibraries, getImportedLibraries());
 					dialog.open();
 					if(Dialog.OK == dialog.getReturnCode()) {
 						// get the result, which is the set of libraries to import
 						List<Object> librariesToImport = Arrays.asList(dialog.getResult());
-						importLibraries((RegisteredLibrary[])librariesToImport.toArray(new RegisteredLibrary[librariesToImport.size()]));
+						importLibraries(librariesToImport.toArray(new RegisteredLibrary[librariesToImport.size()]));
 					}
 				}
 			}, "Import Libraries", "Import Libraries from Repository");
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/actions/ImportProfileAction.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/actions/ImportProfileAction.java
index ac5d6e7438f..aaaf4f6699b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/actions/ImportProfileAction.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/actions/ImportProfileAction.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2009-2010 CEA LIST.

  *

- *    

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.profile.ui.actions;

+package org.eclipse.papyrus.uml.profile.ui.actions;

 

 import java.util.ArrayList;

 import java.util.Arrays;

@@ -25,10 +25,10 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.edit.domain.EditingDomain;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.extensionpoints.uml2.profile.FilteredRegisteredProfilesAsLibrarySelectionDialog;

-import org.eclipse.papyrus.extensionpoints.uml2.profile.RegisteredProfile;

-import org.eclipse.papyrus.extensionpoints.uml2.utils.Util;

-import org.eclipse.papyrus.profile.ui.dialogs.ProfileTreeSelectionDialog;

+import org.eclipse.papyrus.uml.extensionpoints.profile.FilteredRegisteredProfilesAsLibrarySelectionDialog;

+import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;

+import org.eclipse.papyrus.uml.extensionpoints.utils.Util;

+import org.eclipse.papyrus.uml.profile.ui.dialogs.ProfileTreeSelectionDialog;

 import org.eclipse.papyrus.uml.tools.utils.PackageUtil;

 import org.eclipse.swt.widgets.Shell;

 import org.eclipse.ui.PlatformUI;

@@ -48,7 +48,7 @@ public class ImportProfileAction extends AbstractPackageImportAction {
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.profile.ui.actions.AbstractPackageImportAction#getCommand(org.eclipse.emf.edit.domain.EditingDomain)

+	 * @see org.eclipse.papyrus.uml.profile.ui.actions.AbstractPackageImportAction#getCommand(org.eclipse.emf.edit.domain.EditingDomain)

 	 * 

 	 * @param domain

 	 * @return

@@ -110,7 +110,7 @@ public class ImportProfileAction extends AbstractPackageImportAction {
 					PackageImport ei = UMLFactory.eINSTANCE.createPackageImport();

 					ei.setImportedPackage((Package)element);

 

-					//we import only once an element : 

+					//we import only once an element :

 					List<Package> importedPackages = getSelectedElement().getImportedPackages();

 					if(!importedPackages.contains(element)) {

 						getSelectedElement().getPackageImports().add(ei);

@@ -128,7 +128,7 @@ public class ImportProfileAction extends AbstractPackageImportAction {
 	 */

 	protected Object getAvailableProfiles() {

 		List<RegisteredProfile> profiles = new ArrayList<RegisteredProfile>();

-		RegisteredProfile[] allProfiles = org.eclipse.papyrus.extensionpoints.uml2.profile.RegisteredProfile.getRegisteredProfiles();

+		RegisteredProfile[] allProfiles = org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile.getRegisteredProfiles();

 		for(int i = 0; i < allProfiles.length; i++) {

 			RegisteredProfile registeredProfile = allProfiles[i];

 			List<String> importedPackageNames = PackageUtil.getImportedPackagesNames(getSelectedElement());

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/actions/ImportProfilesAsLibraryFromRepositoryAction.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/actions/ImportProfilesAsLibraryFromRepositoryAction.java
index b69605ce20f..cd6d44a108d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/actions/ImportProfilesAsLibraryFromRepositoryAction.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/actions/ImportProfilesAsLibraryFromRepositoryAction.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2008 CEA LIST.
  *
- *    
+ * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.ui.actions;
+package org.eclipse.papyrus.uml.profile.ui.actions;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -26,10 +26,10 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.uml2.profile.FilteredRegisteredProfilesAsLibrarySelectionDialog;
-import org.eclipse.papyrus.extensionpoints.uml2.profile.RegisteredProfile;
-import org.eclipse.papyrus.extensionpoints.uml2.utils.Util;
-import org.eclipse.papyrus.profile.ui.dialogs.PackageImportTreeSelectionDialog;
+import org.eclipse.papyrus.uml.extensionpoints.profile.FilteredRegisteredProfilesAsLibrarySelectionDialog;
+import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;
+import org.eclipse.papyrus.uml.extensionpoints.utils.Util;
+import org.eclipse.papyrus.uml.profile.ui.dialogs.PackageImportTreeSelectionDialog;
 import org.eclipse.papyrus.uml.tools.utils.PackageUtil;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PlatformUI;
@@ -72,12 +72,12 @@ public class ImportProfilesAsLibraryFromRepositoryAction extends AbstractPackage
 		ResourceSet resourceSet = Util.getResourceSet(selectedElement);
 
 		for(int i = 0; i < profilesToImport.length; i++) {
-			RegisteredProfile currentProfile = (RegisteredProfile)(profilesToImport[i]);
+			RegisteredProfile currentProfile = (profilesToImport[i]);
 			URI modelUri = currentProfile.uri;
 
 			Resource modelResource = resourceSet.getResource(modelUri, true);
 			PackageImportTreeSelectionDialog eisd = new PackageImportTreeSelectionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
-					((Package)modelResource.getContents().get(0)));
+				((Package)modelResource.getContents().get(0)));
 			int ret = eisd.open();
 
 			if(ret == Window.OK) {
@@ -111,7 +111,7 @@ public class ImportProfilesAsLibraryFromRepositoryAction extends AbstractPackage
 				profiles.add(registeredProfile);
 			}
 		}
-		return (RegisteredProfile[])profiles.toArray(new RegisteredProfile[profiles.size()]);
+		return profiles.toArray(new RegisteredProfile[profiles.size()]);
 	}
 
 	/**
@@ -168,7 +168,7 @@ public class ImportProfilesAsLibraryFromRepositoryAction extends AbstractPackage
 					if(Dialog.OK == dialog.getReturnCode()) {
 						// get the result, which is the set of libraries to import
 						List<Object> profilesToImport = Arrays.asList(dialog.getResult());
-						importProfiles(((RegisteredProfile[])profilesToImport.toArray(new RegisteredProfile[profilesToImport.size()])));
+						importProfiles(profilesToImport.toArray(new RegisteredProfile[profilesToImport.size()]));
 					}
 				}
 			}, "Import Profiles as libraries", "Import Profiles as libraries from Repository");
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/actions/ReApplyProfiles.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/actions/ReApplyProfiles.java
index cc8135b4d53..c7593f5c0b9 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/actions/ReApplyProfiles.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/actions/ReApplyProfiles.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.ui.actions;
+package org.eclipse.papyrus.uml.profile.ui.actions;
 
 import java.util.Iterator;
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/compositeforview/AppearanceForAppliedStereotypeComposite.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/AppearanceForAppliedStereotypeComposite.java
index 60f33e240a3..62cc6ed3133 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/compositeforview/AppearanceForAppliedStereotypeComposite.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/AppearanceForAppliedStereotypeComposite.java
@@ -12,24 +12,22 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.ui.compositeforview;
+package org.eclipse.papyrus.uml.profile.ui.compositeforview;
 
 import org.eclipse.emf.ecore.EModelElement;
 import org.eclipse.emf.transaction.RecordingCommand;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.ui.parts.TreeViewer;
 import org.eclipse.jface.resource.JFaceColors;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.papyrus.core.utils.EditorUtils;
-import org.eclipse.papyrus.profile.Activator;
-import org.eclipse.papyrus.profile.ImageManager;
-import org.eclipse.papyrus.profile.tree.DisplayedProfileElementLabelProvider;
-import org.eclipse.papyrus.profile.tree.objects.AppliedStereotypePropertyTreeObject;
-import org.eclipse.papyrus.profile.tree.objects.AppliedStereotypeTreeObject;
-import org.eclipse.papyrus.profile.ui.compositesformodel.DecoratedTreeComposite;
+import org.eclipse.papyrus.infra.core.utils.EditorUtils;
 import org.eclipse.papyrus.uml.diagram.common.editparts.IUMLEditPart;
+import org.eclipse.papyrus.uml.profile.Activator;
+import org.eclipse.papyrus.uml.profile.ImageManager;
+import org.eclipse.papyrus.uml.profile.tree.DisplayedProfileElementLabelProvider;
+import org.eclipse.papyrus.uml.profile.tree.objects.AppliedStereotypePropertyTreeObject;
+import org.eclipse.papyrus.uml.profile.tree.objects.AppliedStereotypeTreeObject;
 import org.eclipse.papyrus.uml.tools.utils.ui.helper.AppliedStereotypeHelper;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.MouseEvent;
@@ -52,7 +50,7 @@ import org.eclipse.uml2.uml.Stereotype;
  * 
  * when {@link TreeViewer#setSelection(ISelection)} runs the code could be changed
  */
-public class AppearanceForAppliedStereotypeComposite extends org.eclipse.papyrus.profile.ui.compositeforview.AppliedStereotypeDisplayComposite implements IViewComposite {
+public class AppearanceForAppliedStereotypeComposite extends org.eclipse.papyrus.uml.profile.ui.compositeforview.AppliedStereotypeDisplayComposite implements IViewComposite {
 
 	DisplayedProfileElementLabelProvider displayedProfileElementLabelProvider = new DisplayedProfileElementLabelProvider();
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/compositeforview/AppliedProfileCompositeWithView.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/AppliedProfileCompositeWithView.java
index 688957a77e6..7354ad6a67e 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/compositeforview/AppliedProfileCompositeWithView.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/AppliedProfileCompositeWithView.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.ui.compositeforview;

+package org.eclipse.papyrus.uml.profile.ui.compositeforview;

 

 import org.eclipse.emf.ecore.EModelElement;

 import org.eclipse.jface.resource.JFaceColors;

@@ -24,7 +24,7 @@ import org.eclipse.uml2.uml.Profile;
 /**

  * The Class ProfileComposite to apply or unapply profile only on model element withou view.

  */

-public class AppliedProfileCompositeWithView extends org.eclipse.papyrus.profile.ui.compositesformodel.AppliedProfileCompositeOnModel implements IViewComposite {

+public class AppliedProfileCompositeWithView extends org.eclipse.papyrus.uml.profile.ui.compositesformodel.AppliedProfileCompositeOnModel implements IViewComposite {

 

 	/**

 	 * The Constructor.

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/compositeforview/AppliedStereotypeCompositeWithView.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/AppliedStereotypeCompositeWithView.java
index c5ffc236b87..ce77687786f 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/compositeforview/AppliedStereotypeCompositeWithView.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/AppliedStereotypeCompositeWithView.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.ui.compositeforview;

+package org.eclipse.papyrus.uml.profile.ui.compositeforview;

 

 import org.eclipse.emf.ecore.EModelElement;

 import org.eclipse.emf.transaction.RecordingCommand;

@@ -20,7 +20,7 @@ import org.eclipse.jface.resource.JFaceColors;
 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.papyrus.profile.tree.objects.AppliedStereotypePropertyTreeObject;

+import org.eclipse.papyrus.uml.profile.tree.objects.AppliedStereotypePropertyTreeObject;

 import org.eclipse.papyrus.uml.tools.utils.ui.helper.AppliedStereotypeHelper;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Display;

@@ -31,7 +31,7 @@ import org.eclipse.uml2.uml.Stereotype;
 /**

  * This Composite allows displaying applied stereotypes from the model, but allows also displaying it in the associated view.

  */

-public class AppliedStereotypeCompositeWithView extends org.eclipse.papyrus.profile.ui.compositesformodel.AppliedStereotypeCompositeOnModel implements IViewComposite {

+public class AppliedStereotypeCompositeWithView extends org.eclipse.papyrus.uml.profile.ui.compositesformodel.AppliedStereotypeCompositeOnModel implements IViewComposite {

 

 	/**

 	 * The selection.

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/compositeforview/AppliedStereotypeDisplayComposite.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/AppliedStereotypeDisplayComposite.java
index 43bc40de7b5..2eaf3ffc1a8 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/compositeforview/AppliedStereotypeDisplayComposite.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/AppliedStereotypeDisplayComposite.java
@@ -12,20 +12,20 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.ui.compositeforview;
+package org.eclipse.papyrus.uml.profile.ui.compositeforview;
 
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.papyrus.profile.Activator;
-import org.eclipse.papyrus.profile.preference.ProfilePreferenceConstants;
-import org.eclipse.papyrus.profile.tree.ProfileElementContentProvider;
-import org.eclipse.papyrus.profile.tree.ProfileElementLabelProvider;
-import org.eclipse.papyrus.profile.tree.ProfileElementTreeViewerFilter;
-import org.eclipse.papyrus.profile.tree.objects.AppliedStereotypePropertyTreeObject;
-import org.eclipse.papyrus.profile.tree.objects.StereotypedElementTreeObject;
-import org.eclipse.papyrus.profile.ui.compositesformodel.AppearanceDecoratedTreeComposite;
-import org.eclipse.papyrus.profile.ui.panels.AppliedStereotypePanel;
+import org.eclipse.papyrus.uml.profile.Activator;
+import org.eclipse.papyrus.uml.profile.preference.ProfilePreferenceConstants;
+import org.eclipse.papyrus.uml.profile.tree.ProfileElementContentProvider;
+import org.eclipse.papyrus.uml.profile.tree.ProfileElementLabelProvider;
+import org.eclipse.papyrus.uml.profile.tree.ProfileElementTreeViewerFilter;
+import org.eclipse.papyrus.uml.profile.tree.objects.AppliedStereotypePropertyTreeObject;
+import org.eclipse.papyrus.uml.profile.tree.objects.StereotypedElementTreeObject;
+import org.eclipse.papyrus.uml.profile.ui.compositesformodel.AppearanceDecoratedTreeComposite;
+import org.eclipse.papyrus.uml.profile.ui.panels.AppliedStereotypePanel;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.widgets.Composite;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/compositeforview/AppliedStereotypePropertyCompositeWithView.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/AppliedStereotypePropertyCompositeWithView.java
index df124395d3b..e435918b88b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/compositeforview/AppliedStereotypePropertyCompositeWithView.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/AppliedStereotypePropertyCompositeWithView.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.ui.compositeforview;

+package org.eclipse.papyrus.uml.profile.ui.compositeforview;

 

 import org.eclipse.emf.ecore.EModelElement;

 import org.eclipse.emf.transaction.RecordingCommand;

@@ -26,7 +26,7 @@ import org.eclipse.swt.widgets.Display;
 /**

  * The Class PropertyComposite.

  */

-public class AppliedStereotypePropertyCompositeWithView extends org.eclipse.papyrus.profile.ui.compositesformodel.PropertyComposite implements IViewComposite {

+public class AppliedStereotypePropertyCompositeWithView extends org.eclipse.papyrus.uml.profile.ui.compositesformodel.PropertyComposite implements IViewComposite {

 

 	/**

 	 * the current view

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/compositeforview/IViewComposite.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/IViewComposite.java
index b63e662bb36..c66edc980cb 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/compositeforview/IViewComposite.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/IViewComposite.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.ui.compositeforview;

+package org.eclipse.papyrus.uml.profile.ui.compositeforview;

 

 import org.eclipse.emf.ecore.EModelElement;

 

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/compositeforview/ProfileElementWithDisplayContentProvider.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/ProfileElementWithDisplayContentProvider.java
index cf3fcaf7c3a..b441ed600bf 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/compositeforview/ProfileElementWithDisplayContentProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/ProfileElementWithDisplayContentProvider.java
@@ -12,13 +12,13 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.ui.compositeforview;

+package org.eclipse.papyrus.uml.profile.ui.compositeforview;

 

 import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.papyrus.profile.tree.ProfileElementContentProvider;

-import org.eclipse.papyrus.profile.tree.objects.AppliedStereotypePropertyTreeObject;

-import org.eclipse.papyrus.profile.tree.objects.AppliedStereotypeTreeObject;

-import org.eclipse.papyrus.profile.tree.objects.TreeObject;

+import org.eclipse.papyrus.uml.profile.tree.ProfileElementContentProvider;

+import org.eclipse.papyrus.uml.profile.tree.objects.AppliedStereotypePropertyTreeObject;

+import org.eclipse.papyrus.uml.profile.tree.objects.AppliedStereotypeTreeObject;

+import org.eclipse.papyrus.uml.profile.tree.objects.TreeObject;

 import org.eclipse.uml2.uml.Property;

 import org.eclipse.uml2.uml.Stereotype;

 

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/compositeforview/ProfileElementWithDisplayLabelProvider.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/ProfileElementWithDisplayLabelProvider.java
index b609f22ec7f..85e49b1cd77 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/compositeforview/ProfileElementWithDisplayLabelProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/ProfileElementWithDisplayLabelProvider.java
@@ -12,11 +12,11 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.ui.compositeforview;

+package org.eclipse.papyrus.uml.profile.ui.compositeforview;

 

-import org.eclipse.papyrus.profile.ImageManager;

-import org.eclipse.papyrus.profile.tree.ProfileElementLabelProvider;

-import org.eclipse.papyrus.profile.tree.objects.TreeObject;

+import org.eclipse.papyrus.uml.profile.ImageManager;

+import org.eclipse.papyrus.uml.profile.tree.ProfileElementLabelProvider;

+import org.eclipse.papyrus.uml.profile.tree.objects.TreeObject;

 import org.eclipse.swt.graphics.Image;

 

 /**

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/compositeforview/StereotypePropertiesDoubleClickListener.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/StereotypePropertiesDoubleClickListener.java
index 39624c33184..0c7db40fcea 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/compositeforview/StereotypePropertiesDoubleClickListener.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositeforview/StereotypePropertiesDoubleClickListener.java
@@ -12,10 +12,10 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.ui.compositeforview;

+package org.eclipse.papyrus.uml.profile.ui.compositeforview;

 

 import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.papyrus.profile.ui.listeners.DoubleClickListener;

+import org.eclipse.papyrus.uml.profile.ui.listeners.DoubleClickListener;

 import org.eclipse.swt.widgets.TreeItem;

 

 // TODO: Auto-generated Javadoc

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/compositesformodel/AppearanceDecoratedTreeComposite.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositesformodel/AppearanceDecoratedTreeComposite.java
index 48fe4b68953..06444c8ef20 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/compositesformodel/AppearanceDecoratedTreeComposite.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositesformodel/AppearanceDecoratedTreeComposite.java
@@ -12,12 +12,12 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.ui.compositesformodel;
+package org.eclipse.papyrus.uml.profile.ui.compositesformodel;
 
 import org.eclipse.gef.commands.CommandStack;
 import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.papyrus.profile.tree.ProfileElementTreeViewer;
-import org.eclipse.papyrus.profile.tree.PropertyValueTreeViewer;
+import org.eclipse.papyrus.uml.profile.tree.ProfileElementTreeViewer;
+import org.eclipse.papyrus.uml.profile.tree.PropertyValueTreeViewer;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.layout.FormLayout;
 import org.eclipse.swt.widgets.Composite;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/compositesformodel/AppliedProfileCompositeOnModel.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositesformodel/AppliedProfileCompositeOnModel.java
index 345ba76b924..8f0ebfec612 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/compositesformodel/AppliedProfileCompositeOnModel.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositesformodel/AppliedProfileCompositeOnModel.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2008 CEA LIST.

  *

- *    

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -10,10 +10,10 @@
  * Contributors:

  *  Chokri Mraidha (CEA LIST) Chokri.Mraidha@cea.fr - Initial API and implementation

  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

- *  Emilien Perico (Atos Origin) - fix bug on refresh 

+ *  Emilien Perico (Atos Origin) - fix bug on refresh

  *

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

-package org.eclipse.papyrus.profile.ui.compositesformodel;

+package org.eclipse.papyrus.uml.profile.ui.compositesformodel;

 

 import java.util.ArrayList;

 import java.util.Iterator;

@@ -36,15 +36,15 @@ import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.jface.viewers.ITreeContentProvider;

-import org.eclipse.papyrus.core.utils.EditorUtils;

-import org.eclipse.papyrus.profile.Activator;

-import org.eclipse.papyrus.profile.ImageManager;

-import org.eclipse.papyrus.profile.ui.dialogs.FileSelectionFilter;

-import org.eclipse.papyrus.profile.ui.dialogs.Message;

-import org.eclipse.papyrus.profile.ui.dialogs.ProfileTreeSelectionDialog;

-import org.eclipse.papyrus.profile.ui.dialogs.RegisteredProfileSelectionDialog;

-import org.eclipse.papyrus.profile.ui.panels.AppliedProfilePanel;

+import org.eclipse.papyrus.infra.core.utils.EditorUtils;

 import org.eclipse.papyrus.uml.diagram.common.editparts.IUMLEditPart;

+import org.eclipse.papyrus.uml.profile.Activator;

+import org.eclipse.papyrus.uml.profile.ImageManager;

+import org.eclipse.papyrus.uml.profile.ui.dialogs.FileSelectionFilter;

+import org.eclipse.papyrus.uml.profile.ui.dialogs.Message;

+import org.eclipse.papyrus.uml.profile.ui.dialogs.ProfileTreeSelectionDialog;

+import org.eclipse.papyrus.uml.profile.ui.dialogs.RegisteredProfileSelectionDialog;

+import org.eclipse.papyrus.uml.profile.ui.panels.AppliedProfilePanel;

 import org.eclipse.papyrus.uml.tools.utils.PackageUtil;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.custom.CLabel;

@@ -162,6 +162,7 @@ public class AppliedProfileCompositeOnModel extends Composite {
 						public void run() {

 							getDomain().getCommandStack().execute(new RecordingCommand(domain) {

 

+								@Override

 								protected void doExecute() {

 									PackageUtil.applyProfile(thepackage, profile, withSubProfiles);

 									refresh();

@@ -197,7 +198,7 @@ public class AppliedProfileCompositeOnModel extends Composite {
 		dialog.setMessage("Choose profiles to apply");

 		dialog.setInput(ResourcesPlugin.getWorkspace().getRoot());

 		dialog.addFilter(new FileSelectionFilter(filetypes));

-		dialog.setValidator(new org.eclipse.papyrus.profile.ui.dialogs.FileSelectionValidator());

+		dialog.setValidator(new org.eclipse.papyrus.uml.profile.ui.dialogs.FileSelectionValidator());

 		dialog.setDoubleClickSelects(true);

 		dialog.setHelpAvailable(false);

 		dialog.setAllowMultiple(true);

@@ -231,7 +232,7 @@ public class AppliedProfileCompositeOnModel extends Composite {
 			ProfileTreeSelectionDialog profileDialog = new ProfileTreeSelectionDialog(getShell(), importedModels);

 

 			profileDialog.open();

-			ArrayList<Profile> profilestoApply = (ArrayList<Profile>)profileDialog.getResult();

+			ArrayList<Profile> profilestoApply = profileDialog.getResult();

 

 			Message message = new Message("Profile application", "Applying profile...");

 			message.open();

@@ -405,14 +406,18 @@ public class AppliedProfileCompositeOnModel extends Composite {
 	 * Dispose listeners.

 	 */

 	public void disposeListeners() {

-		if(addButton != null && !addButton.isDisposed())

+		if(addButton != null && !addButton.isDisposed()) {

 			addButton.removeMouseListener(addButtonListener);

-		if(removeButton != null && !removeButton.isDisposed())

+		}

+		if(removeButton != null && !removeButton.isDisposed()) {

 			removeButton.removeMouseListener(removeButtonListener);

-		if(addRegisteredButton != null && !addRegisteredButton.isDisposed())

+		}

+		if(addRegisteredButton != null && !addRegisteredButton.isDisposed()) {

 			addRegisteredButton.removeMouseListener(addRegisteredButtonListener);

-		if(profiles != null && !profiles.isDisposed())

+		}

+		if(profiles != null && !profiles.isDisposed()) {

 			profiles.removeSelectionListener(profilesListener);

+		}

 	}

 

 	public TransactionalEditingDomain getDomain() {

@@ -519,7 +524,7 @@ public class AppliedProfileCompositeOnModel extends Composite {
 			profiles.removeAll();

 			EList<Profile> appliedProfiles = currentPackage.getAllAppliedProfiles();

 			for(int i = 0; i < appliedProfiles.size(); i++) {

-				Profile currentProfile = (Profile)appliedProfiles.get(i);

+				Profile currentProfile = appliedProfiles.get(i);

 				String currentName = currentProfile.getQualifiedName();

 

 				if(currentName == null) {

@@ -582,6 +587,7 @@ public class AppliedProfileCompositeOnModel extends Composite {
 						public void run() {

 							getDomain().getCommandStack().execute(new RecordingCommand(domain) {

 

+								@Override

 								protected void doExecute() {

 									thepackage.unapplyProfile(profile);

 									refresh();

@@ -629,7 +635,7 @@ public class AppliedProfileCompositeOnModel extends Composite {
 				/** delete imported model libraries and types related to that profile */

 

 				// model libraries handling

-				EList importedPackages = ((Package)getSelectedPackage()).getPackageImports();

+				EList importedPackages = getSelectedPackage().getPackageImports();

 				Iterator<PackageImport> iterPI = importedPackages.iterator();

 				ArrayList importedPackagesToRemove = new ArrayList();

 				while(iterPI.hasNext()) {

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/compositesformodel/AppliedStereotypeCompositeOnModel.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositesformodel/AppliedStereotypeCompositeOnModel.java
index 3e6feb39e90..e48ac4ff795 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/compositesformodel/AppliedStereotypeCompositeOnModel.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositesformodel/AppliedStereotypeCompositeOnModel.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.ui.compositesformodel;

+package org.eclipse.papyrus.uml.profile.ui.compositesformodel;

 

 import java.util.ArrayList;

 import java.util.Iterator;

@@ -26,18 +26,18 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.jface.viewers.ISelectionChangedListener;

 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.papyrus.core.utils.EditorUtils;

-import org.eclipse.papyrus.profile.Activator;

-import org.eclipse.papyrus.profile.preference.ProfilePreferenceConstants;

-import org.eclipse.papyrus.profile.tree.ProfileElementContentProvider;

-import org.eclipse.papyrus.profile.tree.ProfileElementLabelProvider;

-import org.eclipse.papyrus.profile.tree.ProfileElementTreeViewerFilter;

-import org.eclipse.papyrus.profile.tree.objects.AppliedStereotypePropertyTreeObject;

-import org.eclipse.papyrus.profile.tree.objects.AppliedStereotypeTreeObject;

-import org.eclipse.papyrus.profile.tree.objects.StereotypedElementTreeObject;

-import org.eclipse.papyrus.profile.ui.dialogs.ChooseSetStereotypeDialog;

-import org.eclipse.papyrus.profile.ui.panels.AppliedStereotypePanel;

-import org.eclipse.papyrus.profile.utils.Util;

+import org.eclipse.papyrus.infra.core.utils.EditorUtils;

+import org.eclipse.papyrus.uml.profile.Activator;

+import org.eclipse.papyrus.uml.profile.preference.ProfilePreferenceConstants;

+import org.eclipse.papyrus.uml.profile.tree.ProfileElementContentProvider;

+import org.eclipse.papyrus.uml.profile.tree.ProfileElementLabelProvider;

+import org.eclipse.papyrus.uml.profile.tree.ProfileElementTreeViewerFilter;

+import org.eclipse.papyrus.uml.profile.tree.objects.AppliedStereotypePropertyTreeObject;

+import org.eclipse.papyrus.uml.profile.tree.objects.AppliedStereotypeTreeObject;

+import org.eclipse.papyrus.uml.profile.tree.objects.StereotypedElementTreeObject;

+import org.eclipse.papyrus.uml.profile.ui.dialogs.ChooseSetStereotypeDialog;

+import org.eclipse.papyrus.uml.profile.ui.panels.AppliedStereotypePanel;

+import org.eclipse.papyrus.uml.profile.utils.Util;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.custom.CLabel;

 import org.eclipse.swt.widgets.Composite;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/compositesformodel/DecoratedTreeComposite.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositesformodel/DecoratedTreeComposite.java
index 6e57d1211bf..f0e8cbb1c26 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/compositesformodel/DecoratedTreeComposite.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositesformodel/DecoratedTreeComposite.java
@@ -12,13 +12,13 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.ui.compositesformodel;

+package org.eclipse.papyrus.uml.profile.ui.compositesformodel;

 

 import org.eclipse.gef.commands.CommandStack;

 import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.papyrus.profile.ImageManager;

-import org.eclipse.papyrus.profile.tree.ProfileElementTreeViewer;

-import org.eclipse.papyrus.profile.tree.PropertyValueTreeViewer;

+import org.eclipse.papyrus.uml.profile.ImageManager;

+import org.eclipse.papyrus.uml.profile.tree.ProfileElementTreeViewer;

+import org.eclipse.papyrus.uml.profile.tree.PropertyValueTreeViewer;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.custom.CLabel;

 import org.eclipse.swt.events.MouseEvent;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/compositesformodel/ISectionComposite.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositesformodel/ISectionComposite.java
index 0c98d43b0c4..bb21f86352d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/compositesformodel/ISectionComposite.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositesformodel/ISectionComposite.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.ui.compositesformodel;

+package org.eclipse.papyrus.uml.profile.ui.compositesformodel;

 

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/compositesformodel/PropertyComposite.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositesformodel/PropertyComposite.java
index 62ac3f189e2..4ac1fd784e4 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/compositesformodel/PropertyComposite.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/compositesformodel/PropertyComposite.java
@@ -13,20 +13,20 @@
  *  Ansgar Radermacher (CEA LIST) Ansgar.Radermacher@cea.fr - modification, clean-up
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.ui.compositesformodel;
+package org.eclipse.papyrus.uml.profile.ui.compositesformodel;
 
 import java.util.ArrayList;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.core.utils.EditorUtils;
-import org.eclipse.papyrus.profile.Message;
-import org.eclipse.papyrus.profile.tree.ProfileElementContentProvider;
-import org.eclipse.papyrus.profile.tree.ProfileElementLabelProvider;
-import org.eclipse.papyrus.profile.tree.objects.AppliedStereotypePropertyTreeObject;
-import org.eclipse.papyrus.profile.tree.objects.AppliedStereotypeTreeObject;
-import org.eclipse.papyrus.profile.tree.objects.StereotypedElementTreeObject;
-import org.eclipse.papyrus.profile.tree.objects.ValueTreeObject;
+import org.eclipse.papyrus.infra.core.utils.EditorUtils;
+import org.eclipse.papyrus.uml.profile.Message;
+import org.eclipse.papyrus.uml.profile.tree.ProfileElementContentProvider;
+import org.eclipse.papyrus.uml.profile.tree.ProfileElementLabelProvider;
+import org.eclipse.papyrus.uml.profile.tree.objects.AppliedStereotypePropertyTreeObject;
+import org.eclipse.papyrus.uml.profile.tree.objects.AppliedStereotypeTreeObject;
+import org.eclipse.papyrus.uml.profile.tree.objects.StereotypedElementTreeObject;
+import org.eclipse.papyrus.uml.profile.tree.objects.ValueTreeObject;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Tree;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/AlphabeticalViewerSorter.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/AlphabeticalViewerSorter.java
index 9c38bd1a5d6..fdfc5fb2820 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/AlphabeticalViewerSorter.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/AlphabeticalViewerSorter.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.ui.dialogs;

+package org.eclipse.papyrus.uml.profile.ui.dialogs;

 

 import org.eclipse.core.runtime.Assert;

 import org.eclipse.jface.viewers.IBaseLabelProvider;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/ChooseDialog.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ChooseDialog.java
index 928279582a2..586724b39e8 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/ChooseDialog.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ChooseDialog.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.ui.dialogs;

+package org.eclipse.papyrus.uml.profile.ui.dialogs;

 

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.swt.SWT;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/ChooseSetAssistedDialog.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ChooseSetAssistedDialog.java
index a9d8496a675..bc97f942a56 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/ChooseSetAssistedDialog.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ChooseSetAssistedDialog.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.ui.dialogs;

+package org.eclipse.papyrus.uml.profile.ui.dialogs;

 

 import java.lang.reflect.InvocationTargetException;

 import java.util.ArrayList;

@@ -39,7 +39,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;

 import org.eclipse.jface.viewers.TableViewer;

 import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.profile.ImageManager;

+import org.eclipse.papyrus.uml.profile.ImageManager;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.KeyEvent;

 import org.eclipse.swt.events.KeyListener;

@@ -57,7 +57,6 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Table;

 import org.eclipse.swt.widgets.TableItem;

 import org.eclipse.swt.widgets.Text;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

 import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;

 

 

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/ChooseSetDialog.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ChooseSetDialog.java
index 6b3d2ada265..8dd97411f5c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/ChooseSetDialog.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ChooseSetDialog.java
@@ -12,11 +12,11 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.ui.dialogs;

+package org.eclipse.papyrus.uml.profile.ui.dialogs;

 

 import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.papyrus.profile.FontManager;

-import org.eclipse.papyrus.profile.ImageManager;

+import org.eclipse.papyrus.uml.profile.FontManager;

+import org.eclipse.papyrus.uml.profile.ImageManager;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.MouseEvent;

 import org.eclipse.swt.events.MouseListener;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/ChooseSetStereotypeDialog.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ChooseSetStereotypeDialog.java
index 49f10c83f69..969ee3ee19a 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/ChooseSetStereotypeDialog.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ChooseSetStereotypeDialog.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.ui.dialogs;

+package org.eclipse.papyrus.uml.profile.ui.dialogs;

 

 import java.util.ArrayList;

 import java.util.Collections;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/ComboSelectionDialog.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ComboSelectionDialog.java
index 6521d8b2925..85c2c7dc80e 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/ComboSelectionDialog.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ComboSelectionDialog.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.ui.dialogs;

+package org.eclipse.papyrus.uml.profile.ui.dialogs;

 

 

 import org.eclipse.swt.widgets.Shell;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/DefinitionHistoryDialog.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/DefinitionHistoryDialog.java
index 48b69a79fb5..c5869e5bb27 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/DefinitionHistoryDialog.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/DefinitionHistoryDialog.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.ui.dialogs;

+package org.eclipse.papyrus.uml.profile.ui.dialogs;

 

 import java.util.ArrayList;

 import java.util.Iterator;

@@ -31,10 +31,10 @@ import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.TableLayout;

 import org.eclipse.jface.viewers.TableViewer;

 import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.profile.ImageManager;

-import org.eclipse.papyrus.profile.definition.IPapyrusVersionConstants;

-import org.eclipse.papyrus.profile.definition.PapyrusDefinitionAnnotation;

-import org.eclipse.papyrus.profile.utils.Util;

+import org.eclipse.papyrus.uml.profile.ImageManager;

+import org.eclipse.papyrus.uml.profile.definition.IPapyrusVersionConstants;

+import org.eclipse.papyrus.uml.profile.definition.PapyrusDefinitionAnnotation;

+import org.eclipse.papyrus.uml.profile.utils.Util;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.Font;

 import org.eclipse.swt.graphics.Image;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/ElementImportTreeSelectionDialog.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ElementImportTreeSelectionDialog.java
index 37fc662f743..b38c19f7970 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/ElementImportTreeSelectionDialog.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ElementImportTreeSelectionDialog.java
@@ -12,14 +12,14 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.ui.dialogs;

+package org.eclipse.papyrus.uml.profile.ui.dialogs;

 

 import java.util.ArrayList;

 import java.util.Iterator;

 import java.util.List;

 

 import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.papyrus.profile.ImageManager;

+import org.eclipse.papyrus.uml.profile.ImageManager;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.swt.layout.GridData;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/ElementList.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ElementList.java
index ef17bb34e9e..c5b76bc5728 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/ElementList.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ElementList.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.ui.dialogs;

+package org.eclipse.papyrus.uml.profile.ui.dialogs;

 

 import java.util.ArrayList;

 import java.util.HashSet;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/FileSelectionFilter.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/FileSelectionFilter.java
index 0928b3785cd..b46f6f005e8 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/FileSelectionFilter.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/FileSelectionFilter.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.ui.dialogs;

+package org.eclipse.papyrus.uml.profile.ui.dialogs;

 

 import java.util.List;

 

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/FileSelectionValidator.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/FileSelectionValidator.java
index 7ae2c474038..4d3e989d580 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/FileSelectionValidator.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/FileSelectionValidator.java
@@ -12,12 +12,12 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.ui.dialogs;

+package org.eclipse.papyrus.uml.profile.ui.dialogs;

 

 import org.eclipse.core.resources.IFile;

 import org.eclipse.core.runtime.IStatus;

 import org.eclipse.core.runtime.Status;

-import org.eclipse.papyrus.profile.Activator;

+import org.eclipse.papyrus.uml.profile.Activator;

 import org.eclipse.ui.dialogs.ISelectionStatusValidator;

 

 

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/IChooseDialog.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/IChooseDialog.java
index d3d854896a4..c10ea93aafa 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/IChooseDialog.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/IChooseDialog.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.ui.dialogs;

+package org.eclipse.papyrus.uml.profile.ui.dialogs;

 

 // TODO: Auto-generated Javadoc

 /**

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/IListViewer.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/IListViewer.java
index 0ce69afad16..3fa6a204fb9 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/IListViewer.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/IListViewer.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.ui.dialogs;

+package org.eclipse.papyrus.uml.profile.ui.dialogs;

 

 

 // TODO: Auto-generated Javadoc

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/InputDialogEnumeration.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/InputDialogEnumeration.java
index 0b5cfa78ee5..5d308f7d180 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/InputDialogEnumeration.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/InputDialogEnumeration.java
@@ -12,14 +12,14 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.ui.dialogs;
+package org.eclipse.papyrus.uml.profile.ui.dialogs;
 
 import java.util.List;
 
 import org.eclipse.emf.common.util.Enumerator;
 import org.eclipse.emf.ecore.EEnumLiteral;
-import org.eclipse.papyrus.profile.Message;
-import org.eclipse.papyrus.profile.utils.Util;
+import org.eclipse.papyrus.uml.profile.Message;
+import org.eclipse.papyrus.uml.profile.utils.Util;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.uml2.uml.Enumeration;
 import org.eclipse.uml2.uml.EnumerationLiteral;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/InputDialogPrimitiveType.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/InputDialogPrimitiveType.java
index a9d77af35b3..cf39c632ac7 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/InputDialogPrimitiveType.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/InputDialogPrimitiveType.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.ui.dialogs;
+package org.eclipse.papyrus.uml.profile.ui.dialogs;
 
 import org.eclipse.jface.dialogs.InputDialog;
 import org.eclipse.swt.widgets.Shell;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/LabelEditorDialog.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/LabelEditorDialog.java
index ed0f20c1c25..44293c17ba5 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/LabelEditorDialog.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/LabelEditorDialog.java
@@ -13,7 +13,7 @@
  *

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

 

-package org.eclipse.papyrus.profile.ui.dialogs;

+package org.eclipse.papyrus.uml.profile.ui.dialogs;

 

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.dialogs.IDialogConstants;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/Message.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/Message.java
index fe2549f2048..ac66b4c4c7c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/Message.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/Message.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.ui.dialogs;
+package org.eclipse.papyrus.uml.profile.ui.dialogs;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Label;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/PackageImportTreeSelectionDialog.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/PackageImportTreeSelectionDialog.java
index be86d2dc58b..a6d1f38340d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/PackageImportTreeSelectionDialog.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/PackageImportTreeSelectionDialog.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.ui.dialogs;

+package org.eclipse.papyrus.uml.profile.ui.dialogs;

 

 import java.util.Iterator;

 

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/ProfileDefinitionDialog.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ProfileDefinitionDialog.java
index b51c89704cb..a7f55330460 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/ProfileDefinitionDialog.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ProfileDefinitionDialog.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.ui.dialogs;

+package org.eclipse.papyrus.uml.profile.ui.dialogs;

 

 import java.text.SimpleDateFormat;

 import java.util.ArrayList;

@@ -23,12 +23,12 @@ import java.util.TimeZone;
 

 import org.eclipse.jface.dialogs.IDialogConstants;

 import org.eclipse.jface.dialogs.TitleAreaDialog;

-import org.eclipse.papyrus.profile.Activator;

-import org.eclipse.papyrus.profile.ImageManager;

-import org.eclipse.papyrus.profile.definition.PapyrusDefinitionAnnotation;

-import org.eclipse.papyrus.profile.definition.Version;

-import org.eclipse.papyrus.profile.preference.ProfileDefinitionPreferenceConstants;

-import org.eclipse.papyrus.profile.utils.Util;

+import org.eclipse.papyrus.uml.profile.Activator;

+import org.eclipse.papyrus.uml.profile.ImageManager;

+import org.eclipse.papyrus.uml.profile.definition.PapyrusDefinitionAnnotation;

+import org.eclipse.papyrus.uml.profile.definition.Version;

+import org.eclipse.papyrus.uml.profile.preference.ProfileDefinitionPreferenceConstants;

+import org.eclipse.papyrus.uml.profile.utils.Util;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.FocusEvent;

 import org.eclipse.swt.events.FocusListener;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/ProfileTreeSelectionDialog.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ProfileTreeSelectionDialog.java
index 4cf14c99973..6961f4192f8 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/ProfileTreeSelectionDialog.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/ProfileTreeSelectionDialog.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.ui.dialogs;

+package org.eclipse.papyrus.uml.profile.ui.dialogs;

 

 import java.util.ArrayList;

 import java.util.Iterator;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/RegisteredProfileSelectionDialog.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/RegisteredProfileSelectionDialog.java
index 80a42b481b1..c34f760533d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/RegisteredProfileSelectionDialog.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/RegisteredProfileSelectionDialog.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.ui.dialogs;
+package org.eclipse.papyrus.uml.profile.ui.dialogs;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -21,9 +21,9 @@ import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.papyrus.extensionpoints.uml2.profile.RegisteredProfile;
-import org.eclipse.papyrus.extensionpoints.uml2.standard.FilteredRegisteredElementsSelectionDialog;
-import org.eclipse.papyrus.extensionpoints.uml2.utils.Util;
+import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;
+import org.eclipse.papyrus.uml.extensionpoints.standard.FilteredRegisteredElementsSelectionDialog;
+import org.eclipse.papyrus.uml.extensionpoints.utils.Util;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.uml2.uml.Package;
 import org.eclipse.uml2.uml.Profile;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/StereotypeLabelProvider.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/StereotypeLabelProvider.java
index 19dd7ea2fbd..83c61898cfc 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/StereotypeLabelProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/StereotypeLabelProvider.java
@@ -12,11 +12,11 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.ui.dialogs;

+package org.eclipse.papyrus.uml.profile.ui.dialogs;

 

 import org.eclipse.jface.viewers.ITableLabelProvider;

 import org.eclipse.jface.viewers.LabelProvider;

-import org.eclipse.papyrus.profile.ImageManager;

+import org.eclipse.papyrus.uml.profile.ImageManager;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.uml2.uml.Stereotype;

 

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/StereotypeQualifiedLabelProvider.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/StereotypeQualifiedLabelProvider.java
index 24cce80a587..4ab6c4986c1 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/dialogs/StereotypeQualifiedLabelProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/StereotypeQualifiedLabelProvider.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.ui.dialogs;

+package org.eclipse.papyrus.uml.profile.ui.dialogs;

 

 import org.eclipse.uml2.uml.Stereotype;

 

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/items/CompositeItems.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/items/CompositeItems.java
index 394ef84c752..307de0fe632 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/items/CompositeItems.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/items/CompositeItems.java
@@ -12,12 +12,12 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.ui.items;
+package org.eclipse.papyrus.uml.profile.ui.items;
 
 import java.util.List;
 
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.profile.Message;
+import org.eclipse.papyrus.uml.profile.Message;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableItem;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/items/DataTypeItems.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/items/DataTypeItems.java
index ac3faf7f31e..122cb720135 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/items/DataTypeItems.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/items/DataTypeItems.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.ui.items;

+package org.eclipse.papyrus.uml.profile.ui.items;

 

 import java.util.List;

 

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/items/EnumerationItems.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/items/EnumerationItems.java
index a60998bc674..4727db0d3ed 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/items/EnumerationItems.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/items/EnumerationItems.java
@@ -12,13 +12,13 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.ui.items;
+package org.eclipse.papyrus.uml.profile.ui.items;
 
 import java.util.List;
 
 import org.eclipse.emf.ecore.EEnumLiteral;
-import org.eclipse.papyrus.profile.Message;
-import org.eclipse.papyrus.profile.utils.Util;
+import org.eclipse.papyrus.uml.profile.Message;
+import org.eclipse.papyrus.uml.profile.utils.Util;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableItem;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/items/MetaclassItems.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/items/MetaclassItems.java
index 729c076d221..1ddbb400446 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/items/MetaclassItems.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/items/MetaclassItems.java
@@ -12,11 +12,11 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.ui.items;
+package org.eclipse.papyrus.uml.profile.ui.items;
 
 import java.util.List;
 
-import org.eclipse.papyrus.profile.Message;
+import org.eclipse.papyrus.uml.profile.Message;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableItem;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/items/PrimitiveTypeItems.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/items/PrimitiveTypeItems.java
index 90744f1eda3..939ae4a5639 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/items/PrimitiveTypeItems.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/items/PrimitiveTypeItems.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.ui.items;
+package org.eclipse.papyrus.uml.profile.ui.items;
 
 import java.util.List;
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/items/StereotypeItems.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/items/StereotypeItems.java
index db0d2b9634b..15889309e2b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/items/StereotypeItems.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/items/StereotypeItems.java
@@ -12,12 +12,12 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.ui.items;
+package org.eclipse.papyrus.uml.profile.ui.items;
 
 import java.util.List;
 
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.profile.Message;
+import org.eclipse.papyrus.uml.profile.Message;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableItem;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/listeners/DoubleClickListener.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/listeners/DoubleClickListener.java
index 83b61967d71..f485a526c9c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/listeners/DoubleClickListener.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/listeners/DoubleClickListener.java
@@ -12,11 +12,11 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.ui.listeners;
+package org.eclipse.papyrus.uml.profile.ui.listeners;
 
 import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.papyrus.profile.tree.objects.AppliedStereotypePropertyTreeObject;
-import org.eclipse.papyrus.profile.tree.objects.ValueTreeObject;
+import org.eclipse.papyrus.uml.profile.tree.objects.AppliedStereotypePropertyTreeObject;
+import org.eclipse.papyrus.uml.profile.tree.objects.ValueTreeObject;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.TreeItem;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/listeners/NoValueException.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/listeners/NoValueException.java
index 905865d2df5..94c410d4ea1 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/listeners/NoValueException.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/listeners/NoValueException.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.ui.listeners;
+package org.eclipse.papyrus.uml.profile.ui.listeners;
 
 // TODO: Auto-generated Javadoc
 /**
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/panels/AbstractPanel.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/panels/AbstractPanel.java
index 9979f894a01..b28f6c224c6 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/panels/AbstractPanel.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/panels/AbstractPanel.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.ui.panels;

+package org.eclipse.papyrus.uml.profile.ui.panels;

 

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Control;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/panels/AppliedProfilePanel.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/panels/AppliedProfilePanel.java
index f1e2840d0c7..5935673db68 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/panels/AppliedProfilePanel.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/panels/AppliedProfilePanel.java
@@ -12,11 +12,11 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.ui.panels;

+package org.eclipse.papyrus.uml.profile.ui.panels;

 

-import org.eclipse.papyrus.profile.ui.compositesformodel.AppliedProfileCompositeOnModel;

-import org.eclipse.papyrus.profile.ui.compositesformodel.AppliedStereotypeCompositeOnModel;

-import org.eclipse.papyrus.profile.ui.compositesformodel.PropertyComposite;

+import org.eclipse.papyrus.uml.profile.ui.compositesformodel.AppliedProfileCompositeOnModel;

+import org.eclipse.papyrus.uml.profile.ui.compositesformodel.AppliedStereotypeCompositeOnModel;

+import org.eclipse.papyrus.uml.profile.ui.compositesformodel.PropertyComposite;

 import org.eclipse.swt.layout.FormAttachment;

 import org.eclipse.swt.layout.FormData;

 import org.eclipse.swt.layout.FormLayout;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/panels/AppliedStereotypePanel.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/panels/AppliedStereotypePanel.java
index 4d8fb308c09..1ddd72763f3 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/panels/AppliedStereotypePanel.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/panels/AppliedStereotypePanel.java
@@ -12,12 +12,12 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.ui.panels;

+package org.eclipse.papyrus.uml.profile.ui.panels;

 

-import org.eclipse.papyrus.profile.tree.objects.AppliedStereotypePropertyTreeObject;

-import org.eclipse.papyrus.profile.tree.objects.StereotypedElementTreeObject;

-import org.eclipse.papyrus.profile.ui.compositesformodel.AppliedStereotypeCompositeOnModel;

-import org.eclipse.papyrus.profile.ui.compositesformodel.PropertyComposite;

+import org.eclipse.papyrus.uml.profile.tree.objects.AppliedStereotypePropertyTreeObject;

+import org.eclipse.papyrus.uml.profile.tree.objects.StereotypedElementTreeObject;

+import org.eclipse.papyrus.uml.profile.ui.compositesformodel.AppliedStereotypeCompositeOnModel;

+import org.eclipse.papyrus.uml.profile.ui.compositesformodel.PropertyComposite;

 import org.eclipse.swt.layout.FormAttachment;

 import org.eclipse.swt.layout.FormData;

 import org.eclipse.swt.layout.FormLayout;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/panels/DefaultPanel.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/panels/DefaultPanel.java
index 145947e0c08..ffae87ca821 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/panels/DefaultPanel.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/panels/DefaultPanel.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.ui.panels;

+package org.eclipse.papyrus.uml.profile.ui.panels;

 

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.layout.GridData;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/section/AppliedProfileSection.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/section/AppliedProfileSection.java
index 86df7e31b87..7d433ce321e 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/section/AppliedProfileSection.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/section/AppliedProfileSection.java
@@ -13,7 +13,7 @@
  *  Jerome BENOIS (Obeo) jerome.benois@obeo.fr - improve to deal with EEF based properties view and model explorer

  *

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

-package org.eclipse.papyrus.profile.ui.section;

+package org.eclipse.papyrus.uml.profile.ui.section;

 

 import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.emf.ecore.EObject;

@@ -21,8 +21,8 @@ import org.eclipse.gef.GraphicalEditPart;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.core.utils.EditorUtils;

-import org.eclipse.papyrus.profile.ui.compositeforview.AppliedProfileCompositeWithView;

+import org.eclipse.papyrus.infra.core.utils.EditorUtils;

+import org.eclipse.papyrus.uml.profile.ui.compositeforview.AppliedProfileCompositeWithView;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.ui.IWorkbenchPart;

 import org.eclipse.ui.views.properties.tabbed.AbstractPropertySection;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/section/AppliedStereotypeDisplaySection.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/section/AppliedStereotypeDisplaySection.java
index 16f01c7c6fa..4cc8ea982b1 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/section/AppliedStereotypeDisplaySection.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/section/AppliedStereotypeDisplaySection.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.ui.section;

+package org.eclipse.papyrus.uml.profile.ui.section;

 

 import org.eclipse.emf.ecore.EModelElement;

 import org.eclipse.gef.GraphicalEditPart;

@@ -20,8 +20,8 @@ import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.profile.tree.objects.StereotypedElementTreeObject;

-import org.eclipse.papyrus.profile.ui.compositeforview.AppearanceForAppliedStereotypeComposite;

+import org.eclipse.papyrus.uml.profile.tree.objects.StereotypedElementTreeObject;

+import org.eclipse.papyrus.uml.profile.ui.compositeforview.AppearanceForAppliedStereotypeComposite;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.ui.IWorkbenchPart;

 import org.eclipse.ui.part.IContributedContentsView;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/section/AppliedStereotypeKindAppearanceSection.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/section/AppliedStereotypeKindAppearanceSection.java
index c83d616971f..d639ad82cd1 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/section/AppliedStereotypeKindAppearanceSection.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/section/AppliedStereotypeKindAppearanceSection.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.ui.section;

+package org.eclipse.papyrus.uml.profile.ui.section;

 

 import org.eclipse.emf.ecore.EModelElement;

 import org.eclipse.emf.transaction.RecordingCommand;

@@ -21,8 +21,8 @@ import org.eclipse.gef.GraphicalEditPart;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.core.editor.IMultiDiagramEditor;

-import org.eclipse.papyrus.core.utils.EditorUtils;

+import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;

+import org.eclipse.papyrus.infra.core.utils.EditorUtils;

 import org.eclipse.papyrus.uml.tools.utils.ElementUtil;

 import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;

 import org.eclipse.papyrus.uml.tools.utils.ui.helper.AppliedStereotypeHelper;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/section/AppliedStereotypePropertiesPlaceSection.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/section/AppliedStereotypePropertiesPlaceSection.java
index 72c49cd18fa..ef90a3105ca 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/section/AppliedStereotypePropertiesPlaceSection.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/section/AppliedStereotypePropertiesPlaceSection.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.profile.ui.section;
+package org.eclipse.papyrus.uml.profile.ui.section;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notification;
@@ -10,8 +10,8 @@ import org.eclipse.gef.GraphicalEditPart;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.core.editor.IMultiDiagramEditor;
-import org.eclipse.papyrus.core.utils.EditorUtils;
+import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
+import org.eclipse.papyrus.infra.core.utils.EditorUtils;
 import org.eclipse.papyrus.uml.tools.utils.ui.VisualInformationPapyrusConstant;
 import org.eclipse.papyrus.uml.tools.utils.ui.helper.AppliedStereotypeHelper;
 import org.eclipse.swt.SWT;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/section/AppliedStereotypeSectionWithView.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/section/AppliedStereotypeSectionWithView.java
index 0373486525a..78a95187585 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/section/AppliedStereotypeSectionWithView.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/section/AppliedStereotypeSectionWithView.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.ui.section;

+package org.eclipse.papyrus.uml.profile.ui.section;

 

 import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.emf.ecore.EObject;

@@ -20,9 +20,9 @@ import org.eclipse.gef.GraphicalEditPart;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.profile.tree.objects.StereotypedElementTreeObject;

-import org.eclipse.papyrus.profile.ui.compositeforview.AppliedStereotypeCompositeWithView;

-import org.eclipse.papyrus.profile.ui.compositeforview.AppliedStereotypePropertyCompositeWithView;

+import org.eclipse.papyrus.uml.profile.tree.objects.StereotypedElementTreeObject;

+import org.eclipse.papyrus.uml.profile.ui.compositeforview.AppliedStereotypeCompositeWithView;

+import org.eclipse.papyrus.uml.profile.ui.compositeforview.AppliedStereotypePropertyCompositeWithView;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.ui.IWorkbenchPart;

 import org.eclipse.ui.views.properties.tabbed.AbstractPropertySection;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/views/ProfilePanelView.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/views/ProfilePanelView.java
index b8f846a9c04..7e4b84ab2fe 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/ui/views/ProfilePanelView.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/views/ProfilePanelView.java
@@ -12,14 +12,14 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification
  *
  *****************************************************************************/
-package org.eclipse.papyrus.profile.ui.views;
+package org.eclipse.papyrus.uml.profile.ui.views;
 
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.profile.ui.panels.AbstractPanel;
-import org.eclipse.papyrus.profile.ui.panels.AppliedProfilePanel;
-import org.eclipse.papyrus.profile.ui.panels.AppliedStereotypePanel;
-import org.eclipse.papyrus.profile.ui.panels.DefaultPanel;
+import org.eclipse.papyrus.uml.profile.ui.panels.AbstractPanel;
+import org.eclipse.papyrus.uml.profile.ui.panels.AppliedProfilePanel;
+import org.eclipse.papyrus.uml.profile.ui.panels.AppliedStereotypePanel;
+import org.eclipse.papyrus.uml.profile.ui.panels.DefaultPanel;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IPartListener;
 import org.eclipse.ui.ISelectionListener;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/utils/ProfileConstraintUtils.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/utils/ProfileConstraintUtils.java
index 6b370356844..2cea2ce31c3 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/utils/ProfileConstraintUtils.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/utils/ProfileConstraintUtils.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.utils;

+package org.eclipse.papyrus.uml.profile.utils;

 

 import java.util.Iterator;

 

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/utils/UmlElementFilter.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/utils/UmlElementFilter.java
index f4c0cd17429..f51f10541c0 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/utils/UmlElementFilter.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/utils/UmlElementFilter.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     CEA LIST - initial API and implementation

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

-package org.eclipse.papyrus.profile.utils;

+package org.eclipse.papyrus.uml.profile.utils;

 

 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

 import org.eclipse.jface.viewers.IFilter;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/utils/Util.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/utils/Util.java
index dcc9ea57047..bba2a8fa7fa 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/utils/Util.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/utils/Util.java
@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *  Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - add getNearestProfileApplication

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

-package org.eclipse.papyrus.profile.utils;

+package org.eclipse.papyrus.uml.profile.utils;

 

 import java.util.ArrayList;

 import java.util.Iterator;

@@ -26,11 +26,11 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.resource.Resource;

 import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.papyrus.profile.Activator;

-import org.eclipse.papyrus.profile.Message;

-import org.eclipse.papyrus.profile.definition.IPapyrusVersionConstants;

-import org.eclipse.papyrus.profile.definition.PapyrusDefinitionAnnotation;

-import org.eclipse.papyrus.profile.definition.Version;

+import org.eclipse.papyrus.uml.profile.Activator;

+import org.eclipse.papyrus.uml.profile.Message;

+import org.eclipse.papyrus.uml.profile.definition.IPapyrusVersionConstants;

+import org.eclipse.papyrus.uml.profile.definition.PapyrusDefinitionAnnotation;

+import org.eclipse.papyrus.uml.profile.definition.Version;

 import org.eclipse.papyrus.uml.tools.utils.PackageUtil;

 import org.eclipse.uml2.uml.Comment;

 import org.eclipse.uml2.uml.DataType;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/wizard/UMLModelWithProfileWizard.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/wizard/UMLModelWithProfileWizard.java
index 55b19430f38..93e5a32bf4b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/profile/wizard/UMLModelWithProfileWizard.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/wizard/UMLModelWithProfileWizard.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2008 CEA LIST.

  *

- *    

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -12,7 +12,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - modification

  *

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

-package org.eclipse.papyrus.profile.wizard;

+package org.eclipse.papyrus.uml.profile.wizard;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -29,8 +29,8 @@ import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.jface.viewers.TableViewer;

 import org.eclipse.jface.wizard.IWizardPage;

 import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.papyrus.extensionpoints.uml2.profile.RegisteredProfile;

-import org.eclipse.papyrus.extensionpoints.uml2.utils.Util;

+import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;

+import org.eclipse.papyrus.uml.extensionpoints.utils.Util;

 import org.eclipse.papyrus.uml.tools.utils.PackageUtil;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.SelectionEvent;

@@ -91,6 +91,7 @@ public class UMLModelWithProfileWizard extends UMLModelWizard {
 	 * 

 	 * @see org.eclipse.uml2.uml.editor.presentation.UMLModelWizard#createInitialModel()

 	 */

+	@Override

 	protected EObject createInitialModel() {

 		EClass eClass = (EClass)umlPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

 		EObject rootObject = umlFactory.create(eClass);

@@ -321,8 +322,8 @@ public class UMLModelWithProfileWizard extends UMLModelWizard {
 			// retrieve sub profiles in the profile => should explore the profile and add elements that match the qualified names

 			rProfilesToApply.add(profile);

 		} else {

-			org.eclipse.papyrus.profile.Activator.getDefault().getLog().log(

-					new Status(IStatus.ERROR, org.eclipse.papyrus.profile.Activator.PLUGIN_ID, IStatus.ERROR, "impossible to find profile: " + name + " in: " + path, null));

+			org.eclipse.papyrus.uml.profile.Activator.getDefault().getLog().log(

+				new Status(IStatus.ERROR, org.eclipse.papyrus.uml.profile.Activator.PLUGIN_ID, IStatus.ERROR, "impossible to find profile: " + name + " in: " + path, null));

 		}

 	}