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

27 files changed, 122 insertions, 136 deletions

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/.project b/plugins/customization/org.eclipse.papyrus.customization.palette/.project
index cdc3f107099..bc61868b490 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/.project
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>org.eclipse.papyrus.customization.palette</name>

+	<name>org.eclipse.papyrus.uml.diagram.customization.palette</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.palette/META-INF/MANIFEST.MF
index 538438716ce..625f049dfb8 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/META-INF/MANIFEST.MF
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/META-INF/MANIFEST.MF
@@ -1,18 +1,13 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.pde;bundle-version="3.6.0",

  org.eclipse.pde.ui;bundle-version="3.6.0",

- org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="0.9.0",

  org.eclipse.emf.facet.infra.browser;bundle-version="0.1.0",

  org.eclipse.emf.facet.infra.browser.custom;bundle-version="0.1.0",

  org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.1.0",

  org.eclipse.emf.facet.infra.facet.core;bundle-version="0.1.0",

  org.eclipse.emf.facet.infra.browser.custom.core;bundle-version="0.1.0",

- org.eclipse.papyrus.customization.paletteconfiguration;bundle-version="0.9.0",

+ org.eclipse.papyrus.uml.diagram.customization.paletteconfiguration;bundle-version="0.9.0",

  org.eclipse.emf.facet.infra.common.core;bundle-version="0.1.0"

-Export-Package: org.eclipse.papyrus.diagram.common.palette.customization,

- org.eclipse.papyrus.diagram.common.palette.customization.dialog,

- org.eclipse.papyrus.diagram.common.palette.customization.proxies,

- org.eclipse.papyrus.diagram.common.part

 Bundle-Vendor: %providerName

 Fragment-Host: org.eclipse.papyrus.uml.diagram.common;bundle-version="0.8.0"

 Eclipse-PatchFragment: true

@@ -20,6 +15,9 @@ Bundle-ClassPath: .
 Bundle-Version: 0.9.0.qualifier

 Bundle-Name: %fragmentName

 Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.customization.palette;singleton:=true

+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.customization.palette;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Export-Package: org.eclipse.papyrus.customization.palette,

+ org.eclipse.papyrus.customization.palette.dialog,

+ org.eclipse.papyrus.customization.palette.proxies

 

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/Messages.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/Messages.java
index 2346264780a..4e6c571964c 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/Messages.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/Messages.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.diagram.common.palette.customization;

+package org.eclipse.papyrus.customization.palette;

 

 import org.eclipse.osgi.util.NLS;

 

@@ -18,7 +18,7 @@ import org.eclipse.osgi.util.NLS;
  */

 public class Messages extends NLS {

 

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

+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.customization.palette.messages"; //$NON-NLS-1$

 

 	public static String BundleIconExplorerDialog_Message;

 

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/AspectActionsInformationComposite.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/AspectActionsInformationComposite.java
index 3f677b37951..57edbfb96fa 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/AspectActionsInformationComposite.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/AspectActionsInformationComposite.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.diagram.common.palette.customization.dialog;

+package org.eclipse.papyrus.customization.palette.dialog;

 

 import java.util.Collections;

 import java.util.List;

@@ -24,13 +24,13 @@ import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;

 import org.eclipse.jface.viewers.TreeViewer;

 import org.eclipse.jface.viewers.Viewer;

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

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

-import org.eclipse.papyrus.diagram.common.service.palette.AspectToolService;

-import org.eclipse.papyrus.diagram.common.service.palette.IAspectAction;

-import org.eclipse.papyrus.diagram.common.service.palette.IAspectActionProvider;

-import org.eclipse.papyrus.diagram.common.service.palette.IPostAction;

-import org.eclipse.papyrus.diagram.common.service.palette.IPreAction;

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

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

+import org.eclipse.papyrus.uml.diagram.common.service.palette.AspectToolService;

+import org.eclipse.papyrus.uml.diagram.common.service.palette.IAspectAction;

+import org.eclipse.papyrus.uml.diagram.common.service.palette.IAspectActionProvider;

+import org.eclipse.papyrus.uml.diagram.common.service.palette.IPostAction;

+import org.eclipse.papyrus.uml.diagram.common.service.palette.IPreAction;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.MouseEvent;

 import org.eclipse.swt.events.MouseListener;

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/BundleExplorerDialog.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/BundleExplorerDialog.java
index c9c1ad1a9f6..3c8a03da0a3 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/BundleExplorerDialog.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/BundleExplorerDialog.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.diagram.common.palette.customization.dialog;

+package org.eclipse.papyrus.customization.palette.dialog;

 

 import java.util.Comparator;

 

@@ -18,7 +18,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;

 import org.eclipse.core.runtime.Status;

 import org.eclipse.jface.dialogs.IDialogSettings;

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

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

 import org.eclipse.pde.core.plugin.IPluginBase;

 import org.eclipse.pde.core.plugin.IPluginModelBase;

 import org.eclipse.pde.internal.ui.PDEPlugin;

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/BundleIconExplorerDialog.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/BundleIconExplorerDialog.java
index 82828fd9453..a39d49489d3 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/BundleIconExplorerDialog.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/BundleIconExplorerDialog.java
@@ -10,7 +10,7 @@
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Bug fix

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

-package org.eclipse.papyrus.diagram.common.palette.customization.dialog;

+package org.eclipse.papyrus.customization.palette.dialog;

 

 import java.net.URL;

 import java.util.ArrayList;

@@ -24,8 +24,8 @@ import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.viewers.LabelProvider;

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

-import org.eclipse.papyrus.diagram.common.palette.customization.Messages;

+import org.eclipse.papyrus.customization.palette.Messages;

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

 import org.eclipse.pde.core.plugin.IPluginModel;

 import org.eclipse.pde.core.plugin.PluginRegistry;

 import org.eclipse.swt.SWT;

@@ -435,7 +435,7 @@ public class BundleIconExplorerDialog extends SelectionStatusDialog {
 		public ImageProxy(URL url) {

 			localPath = url.getPath();

 			path = PLUGIN_PROTOCOL + getCurrentBundleName() + localPath;

-			image = org.eclipse.papyrus.diagram.common.Activator.getImage(path, ""); //$NON-NLS-1$

+			image = org.eclipse.papyrus.uml.diagram.common.Activator.getImage(path, ""); //$NON-NLS-1$

 			int index = localPath.lastIndexOf('/');

 			if(index > 0 && index < localPath.length()) {

 				fileName = localPath.substring(index + 1, localPath.length() - GIF_EXTENSION_LENGTH);

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/ConfigurationInformationComposite.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/ConfigurationInformationComposite.java
index 9693806d57c..902b21e902a 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/ConfigurationInformationComposite.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/ConfigurationInformationComposite.java
@@ -9,17 +9,14 @@
  * Contributors:

  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.diagram.common.palette.customization.dialog;

+package org.eclipse.papyrus.customization.palette.dialog;

 

 import java.util.List;

 

 import org.eclipse.jface.dialogs.Dialog;

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

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

-import org.eclipse.papyrus.paletteconfiguration.Configuration;

-import org.eclipse.papyrus.paletteconfiguration.IconDescriptor;

-import org.eclipse.papyrus.paletteconfiguration.PaletteconfigurationFactory;

-import org.eclipse.papyrus.paletteconfiguration.ToolConfiguration;

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

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

+import org.eclipse.papyrus.uml.diagram.common.service.palette.Configuration;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.FocusEvent;

 import org.eclipse.swt.events.FocusListener;

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/DrawerInformationPage.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/DrawerInformationPage.java
index 42bbaa0a0e6..331d3353985 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/DrawerInformationPage.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/DrawerInformationPage.java
@@ -11,12 +11,12 @@
  *

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

 

-package org.eclipse.papyrus.diagram.common.palette.customization.dialog;

+package org.eclipse.papyrus.customization.palette.dialog;

 

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.wizard.WizardPage;

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

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

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

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

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.MouseEvent;

 import org.eclipse.swt.events.MouseListener;

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/ExtendedPaletteContentPage.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/ExtendedPaletteContentPage.java
index bc76be8132e..938a78fd222 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/ExtendedPaletteContentPage.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/ExtendedPaletteContentPage.java
@@ -10,7 +10,7 @@
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.diagram.common.palette.customization.dialog;

+package org.eclipse.papyrus.customization.palette.dialog;

 

 import java.io.IOException;

 import java.util.ArrayList;

@@ -64,24 +64,15 @@ import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerComparator;

 import org.eclipse.jface.viewers.ViewerFilter;

 import org.eclipse.jface.wizard.WizardPage;

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

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

-import org.eclipse.papyrus.diagram.common.part.PaletteUtil;

-import org.eclipse.papyrus.diagram.common.part.PapyrusPalettePreferences;

-import org.eclipse.papyrus.diagram.common.service.AspectCreationEntry;

-import org.eclipse.papyrus.diagram.common.service.IPapyrusPaletteConstant;

-import org.eclipse.papyrus.diagram.common.service.PapyrusPaletteService;

-import org.eclipse.papyrus.diagram.common.service.palette.StereotypeAspectActionProvider;

-import org.eclipse.papyrus.paletteconfiguration.Configuration;

-import org.eclipse.papyrus.paletteconfiguration.DrawerConfiguration;

-import org.eclipse.papyrus.paletteconfiguration.LeafConfiguration;

-import org.eclipse.papyrus.paletteconfiguration.PaletteConfiguration;

-import org.eclipse.papyrus.paletteconfiguration.PaletteconfigurationPackage;

-import org.eclipse.papyrus.paletteconfiguration.SeparatorConfiguration;

-import org.eclipse.papyrus.paletteconfiguration.StackConfiguration;

-import org.eclipse.papyrus.paletteconfiguration.ToolConfiguration;

-import org.eclipse.papyrus.paletteconfiguration.util.PaletteConfigurationUtils;

-import org.eclipse.papyrus.paletteconfiguration.util.PaletteconfigurationSwitch;

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

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

+import org.eclipse.papyrus.uml.diagram.common.part.PaletteUtil;

+import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPalettePreferences;

+import org.eclipse.papyrus.uml.diagram.common.service.AspectCreationEntry;

+import org.eclipse.papyrus.uml.diagram.common.service.IPapyrusPaletteConstant;

+import org.eclipse.papyrus.uml.diagram.common.service.PapyrusPaletteService;

+import org.eclipse.papyrus.uml.diagram.common.service.palette.Configuration;

+import org.eclipse.papyrus.uml.diagram.common.service.palette.StereotypeAspectActionProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.dnd.DND;

 import org.eclipse.swt.dnd.DragSourceAdapter;

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/ExtendedPaletteInformationPage.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/ExtendedPaletteInformationPage.java
index 6d51ba7e0c9..ee75e351a03 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/ExtendedPaletteInformationPage.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/ExtendedPaletteInformationPage.java
@@ -11,16 +11,16 @@
  *

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

 

-package org.eclipse.papyrus.diagram.common.palette.customization.dialog;

+package org.eclipse.papyrus.customization.palette.dialog;

 

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

 import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditorWithFlyOutPalette;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.wizard.IWizardPage;

 import org.eclipse.jface.wizard.WizardPage;

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

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

-import org.eclipse.papyrus.diagram.common.service.PapyrusPaletteService;

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

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

+import org.eclipse.papyrus.uml.diagram.common.service.PapyrusPaletteService;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.SelectionAdapter;

 import org.eclipse.swt.events.SelectionEvent;

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/LocalPaletteContentPage.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/LocalPaletteContentPage.java
index 5a3934d9082..1ed869310fb 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/LocalPaletteContentPage.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/LocalPaletteContentPage.java
@@ -10,7 +10,7 @@
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.diagram.common.palette.customization.dialog;

+package org.eclipse.papyrus.customization.palette.dialog;

 

 import java.beans.PropertyChangeEvent;

 import java.beans.PropertyChangeListener;

@@ -71,17 +71,17 @@ import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.jface.viewers.ViewerFilter;

 import org.eclipse.jface.wizard.WizardDialog;

 import org.eclipse.jface.wizard.WizardPage;

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

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

-import org.eclipse.papyrus.diagram.common.palette.customization.proxies.XMLDefinitionPaletteProxyFactory;

-import org.eclipse.papyrus.diagram.common.part.PaletteUtil;

-import org.eclipse.papyrus.diagram.common.part.PapyrusPalettePreferences;

-import org.eclipse.papyrus.diagram.common.service.AspectCreationEntry;

-import org.eclipse.papyrus.diagram.common.service.IPapyrusPaletteConstant;

-import org.eclipse.papyrus.diagram.common.service.PapyrusPaletteService;

-import org.eclipse.papyrus.diagram.common.service.XMLDefinitionPaletteParser;

-import org.eclipse.papyrus.diagram.common.service.palette.IAspectAction;

-import org.eclipse.papyrus.diagram.common.service.palette.StereotypeAspectActionProvider;

+import org.eclipse.papyrus.customization.palette.proxies.XMLDefinitionPaletteProxyFactory;

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

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

+import org.eclipse.papyrus.uml.diagram.common.part.PaletteUtil;

+import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPalettePreferences;

+import org.eclipse.papyrus.uml.diagram.common.service.AspectCreationEntry;

+import org.eclipse.papyrus.uml.diagram.common.service.IPapyrusPaletteConstant;

+import org.eclipse.papyrus.uml.diagram.common.service.PapyrusPaletteService;

+import org.eclipse.papyrus.uml.diagram.common.service.XMLDefinitionPaletteParser;

+import org.eclipse.papyrus.uml.diagram.common.service.palette.IAspectAction;

+import org.eclipse.papyrus.uml.diagram.common.service.palette.StereotypeAspectActionProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.dnd.DND;

 import org.eclipse.swt.dnd.DragSourceAdapter;

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/LocalPaletteInformationPage.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/LocalPaletteInformationPage.java
index 57c1bbcb120..973234ca84f 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/LocalPaletteInformationPage.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/LocalPaletteInformationPage.java
@@ -11,7 +11,7 @@
  *

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

 

-package org.eclipse.papyrus.diagram.common.palette.customization.dialog;

+package org.eclipse.papyrus.customization.palette.dialog;

 

 import java.util.Arrays;

 

@@ -20,10 +20,10 @@ import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditorWithFlyOutPalette;
 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.wizard.IWizardPage;

 import org.eclipse.jface.wizard.WizardPage;

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

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

-import org.eclipse.papyrus.diagram.common.part.PapyrusPalettePreferences;

-import org.eclipse.papyrus.diagram.common.service.PapyrusPaletteService;

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

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

+import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPalettePreferences;

+import org.eclipse.papyrus.uml.diagram.common.service.PapyrusPaletteService;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.SelectionAdapter;

 import org.eclipse.swt.events.SelectionEvent;

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/NewDrawerWizard.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/NewDrawerWizard.java
index 1a612a52d97..a249f361758 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/NewDrawerWizard.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/NewDrawerWizard.java
@@ -11,7 +11,7 @@
  *

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

 

-package org.eclipse.papyrus.diagram.common.palette.customization.dialog;

+package org.eclipse.papyrus.customization.palette.dialog;

 

 import org.eclipse.jface.wizard.Wizard;

 

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/NewLocalPaletteWizard.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/NewLocalPaletteWizard.java
index 669c1ba4ac9..83f66775a18 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/NewLocalPaletteWizard.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/NewLocalPaletteWizard.java
@@ -11,11 +11,11 @@
  *

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

 

-package org.eclipse.papyrus.diagram.common.palette.customization.dialog;

+package org.eclipse.papyrus.customization.palette.dialog;

 

 import org.eclipse.gef.ui.palette.PaletteCustomizer;

 import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.papyrus.diagram.common.part.PapyrusPalettePreferences;

+import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPalettePreferences;

 import org.eclipse.ui.IEditorPart;

 

 /**

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/PaletteAspectToolEntryProxy.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteAspectToolEntryProxy.java
index 263731bdfd2..cad63a2b3e9 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/PaletteAspectToolEntryProxy.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteAspectToolEntryProxy.java
@@ -11,21 +11,21 @@
  *

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

 

-package org.eclipse.papyrus.diagram.common.palette.customization.dialog;

+package org.eclipse.papyrus.customization.palette.dialog;

 

 import java.util.ArrayList;

 import java.util.List;

 

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

-import org.eclipse.papyrus.diagram.common.service.AspectCreationEntry;

-import org.eclipse.papyrus.diagram.common.service.IPapyrusPaletteConstant;

-import org.eclipse.papyrus.diagram.common.service.palette.AspectToolService;

-import org.eclipse.papyrus.diagram.common.service.palette.IAspectAction;

-import org.eclipse.papyrus.diagram.common.service.palette.IAspectActionProvider;

-import org.eclipse.papyrus.diagram.common.service.palette.IPaletteAspectToolEntryProxy;

-import org.eclipse.papyrus.diagram.common.service.palette.IPostAction;

-import org.eclipse.papyrus.diagram.common.service.palette.IPreAction;

-import org.eclipse.papyrus.diagram.common.service.palette.StereotypePostAction;

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

+import org.eclipse.papyrus.uml.diagram.common.service.AspectCreationEntry;

+import org.eclipse.papyrus.uml.diagram.common.service.IPapyrusPaletteConstant;

+import org.eclipse.papyrus.uml.diagram.common.service.palette.AspectToolService;

+import org.eclipse.papyrus.uml.diagram.common.service.palette.IAspectAction;

+import org.eclipse.papyrus.uml.diagram.common.service.palette.IAspectActionProvider;

+import org.eclipse.papyrus.uml.diagram.common.service.palette.IPaletteAspectToolEntryProxy;

+import org.eclipse.papyrus.uml.diagram.common.service.palette.IPostAction;

+import org.eclipse.papyrus.uml.diagram.common.service.palette.IPreAction;

+import org.eclipse.papyrus.uml.diagram.common.service.palette.StereotypePostAction;

 import org.eclipse.swt.graphics.Image;

 import org.w3c.dom.Node;

 import org.w3c.dom.NodeList;

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/PaletteContainerProxy.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteContainerProxy.java
index f40123db224..2876bdfd16e 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/PaletteContainerProxy.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteContainerProxy.java
@@ -9,13 +9,13 @@
  * Contributors:

  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.diagram.common.palette.customization.dialog;

+package org.eclipse.papyrus.customization.palette.dialog;

 

 import java.util.ArrayList;

 import java.util.List;

 

 import org.eclipse.gef.palette.PaletteContainer;

-import org.eclipse.papyrus.diagram.common.palette.customization.dialog.LocalPaletteContentPage.EntryType;

+import org.eclipse.papyrus.customization.palette.dialog.LocalPaletteContentPage.EntryType;

 

 /**

  * Proxy class for container entries

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/PaletteEntryProxy.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteEntryProxy.java
index 9c94a930f7c..bac885bd890 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/PaletteEntryProxy.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteEntryProxy.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.diagram.common.palette.customization.dialog;

+package org.eclipse.papyrus.customization.palette.dialog;

 

 import java.beans.PropertyChangeListener;

 import java.beans.PropertyChangeSupport;

@@ -20,10 +20,10 @@ import org.eclipse.gef.palette.PaletteEntry;
 import org.eclipse.gef.palette.PaletteSeparator;

 import org.eclipse.gef.palette.PaletteStack;

 import org.eclipse.gef.palette.ToolEntry;

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

-import org.eclipse.papyrus.diagram.common.palette.customization.dialog.LocalPaletteContentPage.EntryType;

-import org.eclipse.papyrus.diagram.common.service.AspectCreationEntry;

-import org.eclipse.papyrus.diagram.common.service.palette.IPaletteEntryProxy;

+import org.eclipse.papyrus.customization.palette.dialog.LocalPaletteContentPage.EntryType;

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

+import org.eclipse.papyrus.uml.diagram.common.service.AspectCreationEntry;

+import org.eclipse.papyrus.uml.diagram.common.service.palette.IPaletteEntryProxy;

 import org.eclipse.swt.graphics.Image;

 

 /**

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/PaletteEntryProxyInformationComposite.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteEntryProxyInformationComposite.java
index 2409b714baf..df5c27f6fe4 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/PaletteEntryProxyInformationComposite.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteEntryProxyInformationComposite.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.diagram.common.palette.customization.dialog;

+package org.eclipse.papyrus.customization.palette.dialog;

 

 import java.util.List;

 

@@ -17,10 +17,10 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.gef.palette.CombinedTemplateCreationEntry;

 import org.eclipse.gef.palette.PaletteEntry;

 import org.eclipse.jface.dialogs.Dialog;

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

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

-import org.eclipse.papyrus.diagram.common.palette.customization.dialog.LocalPaletteContentPage.EntryType;

-import org.eclipse.papyrus.diagram.common.part.PaletteUtil;

+import org.eclipse.papyrus.customization.palette.dialog.LocalPaletteContentPage.EntryType;

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

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

+import org.eclipse.papyrus.uml.diagram.common.part.PaletteUtil;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.FocusEvent;

 import org.eclipse.swt.events.FocusListener;

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/PaletteLocalDrawerProxy.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteLocalDrawerProxy.java
index e5bf5ea8a2f..7eb87f859b3 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/PaletteLocalDrawerProxy.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteLocalDrawerProxy.java
@@ -9,13 +9,13 @@
  * Contributors:

  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.diagram.common.palette.customization.dialog;

+package org.eclipse.papyrus.customization.palette.dialog;

 

 import java.beans.PropertyChangeListener;

 import java.beans.PropertyChangeSupport;

 

 import org.eclipse.gef.palette.PaletteContainer;

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

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

 import org.eclipse.swt.graphics.Image;

 

 /**

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/PaletteLocalSeparatorProxy.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteLocalSeparatorProxy.java
index 6277bfecefe..58b5acded28 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/PaletteLocalSeparatorProxy.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteLocalSeparatorProxy.java
@@ -11,10 +11,10 @@
  *

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

 

-package org.eclipse.papyrus.diagram.common.palette.customization.dialog;

+package org.eclipse.papyrus.customization.palette.dialog;

 

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

-import org.eclipse.papyrus.diagram.common.palette.customization.dialog.LocalPaletteContentPage.EntryType;

+import org.eclipse.papyrus.customization.palette.dialog.LocalPaletteContentPage.EntryType;

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

 import org.eclipse.swt.graphics.Image;

 

 /**

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/PaletteLocalStackProxy.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteLocalStackProxy.java
index 6a4b1d4dc0c..605ae9c69c8 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/PaletteLocalStackProxy.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteLocalStackProxy.java
@@ -11,10 +11,10 @@
  *

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

 

-package org.eclipse.papyrus.diagram.common.palette.customization.dialog;

+package org.eclipse.papyrus.customization.palette.dialog;

 

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

-import org.eclipse.papyrus.diagram.common.palette.customization.dialog.LocalPaletteContentPage.EntryType;

+import org.eclipse.papyrus.customization.palette.dialog.LocalPaletteContentPage.EntryType;

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

 import org.eclipse.swt.graphics.Image;

 

 /**

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/PapyrusPaletteCustomizerDialog.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PapyrusPaletteCustomizerDialog.java
index 961b018de20..ed6a077d17d 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/PapyrusPaletteCustomizerDialog.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PapyrusPaletteCustomizerDialog.java
@@ -11,7 +11,7 @@
  *

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

 

-package org.eclipse.papyrus.diagram.common.palette.customization.dialog;

+package org.eclipse.papyrus.customization.palette.dialog;

 

 import java.util.HashMap;

 import java.util.Iterator;

@@ -45,15 +45,15 @@ import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TreeViewer;

 import org.eclipse.jface.viewers.Viewer;

 import org.eclipse.jface.wizard.WizardDialog;

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

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

-import org.eclipse.papyrus.diagram.common.part.PaletteUtil;

-import org.eclipse.papyrus.diagram.common.part.PapyrusPaletteCustomizer;

-import org.eclipse.papyrus.diagram.common.part.PapyrusPalettePreferences;

-import org.eclipse.papyrus.diagram.common.service.PapyrusPaletteService;

-import org.eclipse.papyrus.diagram.common.service.PapyrusPaletteService.ExtendedProviderDescriptor;

-import org.eclipse.papyrus.diagram.common.service.PapyrusPaletteService.LocalProviderDescriptor;

 import org.eclipse.papyrus.sasheditor.editor.ISashWindowsContainer;

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

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

+import org.eclipse.papyrus.uml.diagram.common.part.PaletteUtil;

+import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteCustomizer;

+import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPalettePreferences;

+import org.eclipse.papyrus.uml.diagram.common.service.PapyrusPaletteService;

+import org.eclipse.papyrus.uml.diagram.common.service.PapyrusPaletteService.ExtendedProviderDescriptor;

+import org.eclipse.papyrus.uml.diagram.common.service.PapyrusPaletteService.LocalProviderDescriptor;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.MouseEvent;

 import org.eclipse.swt.events.MouseListener;

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/UpdateExtendedPaletteWizard.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/UpdateExtendedPaletteWizard.java
index d7c87426b56..d2a1672b4bc 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/UpdateExtendedPaletteWizard.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/UpdateExtendedPaletteWizard.java
@@ -11,13 +11,13 @@
  *

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

 

-package org.eclipse.papyrus.diagram.common.palette.customization.dialog;

+package org.eclipse.papyrus.customization.palette.dialog;

 

 import org.eclipse.gef.ui.palette.PaletteCustomizer;

 import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditorWithFlyOutPalette;

 import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.papyrus.diagram.common.part.PapyrusPalettePreferences;

-import org.eclipse.papyrus.diagram.common.service.PapyrusPaletteService;

+import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPalettePreferences;

+import org.eclipse.papyrus.uml.diagram.common.service.PapyrusPaletteService;

 import org.eclipse.ui.IEditorPart;

 

 /**

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/UpdateLocalDrawerWizard.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/UpdateLocalDrawerWizard.java
index 60184ed81d9..39e92b2e158 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/UpdateLocalDrawerWizard.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/UpdateLocalDrawerWizard.java
@@ -11,7 +11,7 @@
  *

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

 

-package org.eclipse.papyrus.diagram.common.palette.customization.dialog;

+package org.eclipse.papyrus.customization.palette.dialog;

 

 import org.eclipse.jface.wizard.Wizard;

 

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/UpdateLocalPaletteWizard.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/UpdateLocalPaletteWizard.java
index 25e4deee937..73d5b3d45ca 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/dialog/UpdateLocalPaletteWizard.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/UpdateLocalPaletteWizard.java
@@ -11,12 +11,12 @@
  *

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

 

-package org.eclipse.papyrus.diagram.common.palette.customization.dialog;

+package org.eclipse.papyrus.customization.palette.dialog;

 

 import org.eclipse.gef.ui.palette.PaletteCustomizer;

 import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.papyrus.diagram.common.part.PapyrusPalettePreferences;

-import org.eclipse.papyrus.diagram.common.service.PapyrusPaletteService;

+import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPalettePreferences;

+import org.eclipse.papyrus.uml.diagram.common.service.PapyrusPaletteService;

 import org.eclipse.ui.IEditorPart;

 

 /**

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/messages.properties b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/messages.properties
index 2fa7dfeda63..2fa7dfeda63 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/messages.properties
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/messages.properties
diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/proxies/XMLDefinitionPaletteProxyFactory.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/proxies/XMLDefinitionPaletteProxyFactory.java
index c62e9247782..4fecc58da26 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/diagram/common/palette/customization/proxies/XMLDefinitionPaletteProxyFactory.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/proxies/XMLDefinitionPaletteProxyFactory.java
@@ -11,23 +11,23 @@
  *

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

 

-package org.eclipse.papyrus.diagram.common.palette.customization.proxies;

+package org.eclipse.papyrus.customization.palette.proxies;

 

 import java.util.HashMap;

 import java.util.Map;

 

 import org.eclipse.gef.palette.PaletteEntry;

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

-import org.eclipse.papyrus.diagram.common.palette.customization.dialog.PaletteAspectToolEntryProxy;

-import org.eclipse.papyrus.diagram.common.palette.customization.dialog.PaletteContainerProxy;

-import org.eclipse.papyrus.diagram.common.palette.customization.dialog.PaletteEntryProxy;

-import org.eclipse.papyrus.diagram.common.palette.customization.dialog.PaletteLocalDrawerProxy;

-import org.eclipse.papyrus.diagram.common.palette.customization.dialog.PaletteLocalSeparatorProxy;

-import org.eclipse.papyrus.diagram.common.palette.customization.dialog.PaletteLocalStackProxy;

-import org.eclipse.papyrus.diagram.common.service.AbstractXMLDefinitionPaletteFactory;

-import org.eclipse.papyrus.diagram.common.service.AspectCreationEntry;

-import org.eclipse.papyrus.diagram.common.service.IPapyrusPaletteConstant;

-import org.eclipse.papyrus.diagram.common.service.palette.IPaletteEntryProxy;

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

+import org.eclipse.papyrus.customization.palette.dialog.PaletteAspectToolEntryProxy;

+import org.eclipse.papyrus.customization.palette.dialog.PaletteContainerProxy;

+import org.eclipse.papyrus.customization.palette.dialog.PaletteEntryProxy;

+import org.eclipse.papyrus.customization.palette.dialog.PaletteLocalDrawerProxy;

+import org.eclipse.papyrus.customization.palette.dialog.PaletteLocalSeparatorProxy;

+import org.eclipse.papyrus.customization.palette.dialog.PaletteLocalStackProxy;

+import org.eclipse.papyrus.uml.diagram.common.service.AbstractXMLDefinitionPaletteFactory;

+import org.eclipse.papyrus.uml.diagram.common.service.AspectCreationEntry;

+import org.eclipse.papyrus.uml.diagram.common.service.IPapyrusPaletteConstant;

+import org.eclipse.papyrus.uml.diagram.common.service.palette.IPaletteEntryProxy;

 import org.w3c.dom.Node;

 

 /**