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

20 files changed, 87 insertions, 57 deletions

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/.project b/plugins/customization/org.eclipse.papyrus.customization.palette/.project
index bc61868b490..cdc3f107099 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.uml.diagram.customization.palette</name>

+	<name>org.eclipse.papyrus.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 625f049dfb8..b047f5ab1cf 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
@@ -6,8 +6,8 @@ Require-Bundle: org.eclipse.pde;bundle-version="3.6.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.uml.diagram.customization.paletteconfiguration;bundle-version="0.9.0",

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

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

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

 Bundle-Vendor: %providerName

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

 Eclipse-PatchFragment: true

@@ -15,7 +15,7 @@ Bundle-ClassPath: .
 Bundle-Version: 0.9.0.qualifier

 Bundle-Name: %fragmentName

 Bundle-ManifestVersion: 2

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

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

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

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

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

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/AspectActionsInformationComposite.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/AspectActionsInformationComposite.java
index 57edbfb96fa..92c4440a2d6 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/AspectActionsInformationComposite.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/AspectActionsInformationComposite.java
@@ -1,6 +1,6 @@
 /*****************************************************************************

  * Copyright (c) 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

@@ -396,7 +396,7 @@ public class AspectActionsInformationComposite {
 			// select first action

 			handleActionListSelectionChanged(null);

 

-			// select first post action 

+			// select first post action

 			if(selectedEntryProxy instanceof PaletteAspectToolEntryProxy && ((PaletteAspectToolEntryProxy)selectedEntryProxy).getPostActions().size() > 0) {

 				viewer.setSelection(new StructuredSelection(((PaletteAspectToolEntryProxy)selectedEntryProxy).getPostActions().get(0)), true);

 			}

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/BundleExplorerDialog.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/BundleExplorerDialog.java
index 3c8a03da0a3..b30fa37b226 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/BundleExplorerDialog.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/BundleExplorerDialog.java
@@ -1,6 +1,6 @@
 /*****************************************************************************

  * Copyright (c) 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

@@ -33,7 +33,7 @@ import org.eclipse.ui.dialogs.FilteredItemsSelectionDialog;
  */

 public class BundleExplorerDialog extends FilteredItemsSelectionDialog {

 

-	private static final String DIALOG_SETTINGS = "org.eclipse.papyrus.ui.toolbox.BundleExplorerDialog";

+	private static final String DIALOG_SETTINGS = "org.eclipse.papyrus.infra.widgets.toolbox.BundleExplorerDialog";

 

 	private IPluginModelBase[] fModels;

 

@@ -126,10 +126,12 @@ public class BundleExplorerDialog extends FilteredItemsSelectionDialog {
 

 	private class PluginSearchItemsFilter extends ItemsFilter {

 

+		@Override

 		public boolean isConsistentItem(Object item) {

 			return true;

 		}

 

+		@Override

 		public boolean matchItem(Object item) {

 			String id = null;

 			if(item instanceof IPluginModelBase) {

@@ -140,6 +142,7 @@ public class BundleExplorerDialog extends FilteredItemsSelectionDialog {
 			return (matches(id));

 		}

 

+		@Override

 		protected boolean matches(String text) {

 			String pattern = patternMatcher.getPattern();

 			if(pattern.indexOf("*") != 0 & pattern.indexOf("?") != 0 & pattern.indexOf(".") != 0) {//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

@@ -156,8 +159,9 @@ public class BundleExplorerDialog extends FilteredItemsSelectionDialog {
 			int id1 = getId(o1);

 			int id2 = getId(o2);

 

-			if(id1 != id2)

+			if(id1 != id2) {

 				return id1 - id2;

+			}

 			return compareSimilarObjects(o1, o2);

 		}

 

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/BundleIconExplorerDialog.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/BundleIconExplorerDialog.java
index a39d49489d3..e6a64ee1ae7 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/BundleIconExplorerDialog.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/BundleIconExplorerDialog.java
@@ -1,6 +1,6 @@
 /*****************************************************************************

  * Copyright (c) 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

@@ -244,7 +244,7 @@ public class BundleIconExplorerDialog extends SelectionStatusDialog {
 	 * Handles action when user press the Manage bundle button in the combo area

 	 */

 	protected void handleManageBundlesButtonPressed() {

-		// open a dialog 

+		// open a dialog

 		BundleExplorerDialog dialog = new BundleExplorerDialog(getParentShell(), false, PluginRegistry.getActiveModels(true));

 		if(Dialog.OK == dialog.open()) {

 			text.setText(((IPluginModel)dialog.getFirstResult()).getPlugin().getId());

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/ConfigurationInformationComposite.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/ConfigurationInformationComposite.java
index 902b21e902a..ba7484077fc 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/ConfigurationInformationComposite.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/ConfigurationInformationComposite.java
@@ -1,6 +1,6 @@
 /*****************************************************************************

  * Copyright (c) 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

@@ -16,7 +16,10 @@ import java.util.List;
 import org.eclipse.jface.dialogs.Dialog;

 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.papyrus.uml.diagram.paletteconfiguration.Configuration;

+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.IconDescriptor;

+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationFactory;

+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolConfiguration;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.FocusEvent;

 import org.eclipse.swt.events.FocusListener;

@@ -314,7 +317,7 @@ public class ConfigurationInformationComposite {
 			String text = iconText.getText();

 			if(selectedConfiguration != null && text != null && !text.equals("")) {

 

-				// parse the text.... 

+				// parse the text....

 				if(!text.startsWith(PLUGIN_PROTOCOL)) {

 					return;

 				}

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/DrawerInformationPage.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/DrawerInformationPage.java
index 331d3353985..0d691fbc503 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/DrawerInformationPage.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/DrawerInformationPage.java
@@ -1,6 +1,6 @@
 /*****************************************************************************

  * Copyright (c) 2009 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

@@ -239,6 +239,7 @@ public class DrawerInformationPage extends WizardPage implements Listener {
 		advancedButton.setLayoutData(data);

 		advancedButton.addSelectionListener(new SelectionAdapter() {

 

+			@Override

 			public void widgetSelected(SelectionEvent e) {

 				handleAdvancedButtonSelect();

 			}

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/ExtendedPaletteContentPage.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/ExtendedPaletteContentPage.java
index 938a78fd222..6043daf451d 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/ExtendedPaletteContentPage.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/ExtendedPaletteContentPage.java
@@ -1,6 +1,6 @@
 /*****************************************************************************

  * Copyright (c) 2009 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

@@ -71,8 +71,17 @@ 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.papyrus.uml.diagram.paletteconfiguration.Configuration;

+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.DrawerConfiguration;

+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.LeafConfiguration;

+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteConfiguration;

+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;

+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.SeparatorConfiguration;

+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.StackConfiguration;

+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolConfiguration;

+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.util.PaletteConfigurationUtils;

+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.util.PaletteconfigurationSwitch;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.dnd.DND;

 import org.eclipse.swt.dnd.DragSourceAdapter;

@@ -307,7 +316,7 @@ public class ExtendedPaletteContentPage extends WizardPage implements Listener {
 		// create Palette Group

 		createPalettePreviewGroup();

 

-		// create tool description group (custom name, description, and perhaphs icon.... Just under this group, another one with aspect actions) 

+		// create tool description group (custom name, description, and perhaphs icon.... Just under this group, another one with aspect actions)

 		createToolDescriptionGroup();

 

 		// just under, creates a new line of composites...

@@ -489,7 +498,7 @@ public class ExtendedPaletteContentPage extends WizardPage implements Listener {
 			public void drop(DropTargetEvent event) {

 				super.drop(event);

 				IStructuredSelection transferedSelection = (IStructuredSelection)LocalSelectionTransfer.getTransfer().nativeToJava(event.currentDataType);

-				Object objectToTransfer = ((IStructuredSelection)transferedSelection).getFirstElement();

+				Object objectToTransfer = transferedSelection.getFirstElement();

 				if(!(objectToTransfer instanceof IAdaptable)) {

 					return;

 				}

@@ -644,7 +653,7 @@ public class ExtendedPaletteContentPage extends WizardPage implements Listener {
 	 */

 	protected void checkSelectionForDrop(IStructuredSelection transferedSelection, TreeItem item, final DropTargetEvent event) {

 		event.detail = DND.DROP_NONE;

-		final Object objectToTransfer = ((IStructuredSelection)transferedSelection).getFirstElement();

+		final Object objectToTransfer = transferedSelection.getFirstElement();

 		if(!(objectToTransfer instanceof IAdaptable)) {

 			return;

 		}

@@ -1150,7 +1159,7 @@ public class ExtendedPaletteContentPage extends WizardPage implements Listener {
 

 	//	/**

 	//	 * Creates a node in the xml document from the given entry

-	//	 * 

+	//	 *

 	//	 * @param entry

 	//	 *        the palette entry from which to create the node

 	//	 * @param parentNode

@@ -1820,7 +1829,7 @@ public class ExtendedPaletteContentPage extends WizardPage implements Listener {
 	//

 	//	/**

 	//	 * Saves the xml document into file

-	//	 * 

+	//	 *

 	//	 * @param document

 	//	 *        the document to save

 	//	 * @param path

@@ -1851,7 +1860,7 @@ public class ExtendedPaletteContentPage extends WizardPage implements Listener {
 	//

 	//	/**

 	//	 * Creates the document from the palette preview

-	//	 * 

+	//	 *

 	//	 * @return the dom structure of the document

 	//	 */

 	//	protected Document createXMLDocumentFromPalettePreview() {

@@ -1876,7 +1885,7 @@ public class ExtendedPaletteContentPage extends WizardPage implements Listener {
 	//

 	//	/**

 	//	 * Generates the xml content for the palette

-	//	 * 

+	//	 *

 	//	 * @param document

 	//	 *        the document to fill

 	//	 * @param contentElement

@@ -1891,7 +1900,7 @@ public class ExtendedPaletteContentPage extends WizardPage implements Listener {
 	//

 	//	/**

 	//	 * Generates the xml content for the given container

-	//	 * 

+	//	 *

 	//	 * @param document

 	//	 *        the document to fill

 	//	 * @param containerProxy

@@ -1976,6 +1985,7 @@ public class ExtendedPaletteContentPage extends WizardPage implements Listener {
 		/**

 		 * {@inheritDoc}

 		 */

+		@Override

 		public int compare(Viewer testViewer, Object e1, Object e2) {

 			String label1 = "";

 			String label2 = "";

@@ -1991,10 +2001,12 @@ public class ExtendedPaletteContentPage extends WizardPage implements Listener {
 				label2 = ((Stereotype)e2).getName();

 			}

 

-			if(label1 == null)

+			if(label1 == null) {

 				return 1;

-			if(label2 == null)

+			}

+			if(label2 == null) {

 				return -1;

+			}

 

 			return label1.compareTo(label2);

 		}

@@ -2110,7 +2122,7 @@ public class ExtendedPaletteContentPage extends WizardPage implements Listener {
 										HashMap properties = new HashMap();

 										properties.put(IPapyrusPaletteConstant.ASPECT_ACTION_KEY, StereotypeAspectActionProvider.createConfigurationNode(stereotype.getQualifiedName()));

 										AspectCreationEntry aspectEntry = new AspectCreationEntry(stereotype.getName() + " (" + entry.getLabel() + ")", "Create an element with a stereotype", entry.getId() + "_" + System.currentTimeMillis(), entry.getSmallIcon(), (CombinedTemplateCreationEntry)entry, properties);

-										entries.add((PaletteEntry)aspectEntry);

+										entries.add(aspectEntry);

 									}

 								}

 

@@ -2119,8 +2131,9 @@ public class ExtendedPaletteContentPage extends WizardPage implements Listener {
 					}

 				}

 				return entries.toArray();

-			} else

+			} else {

 				return new Object[0];

+			}

 		}

 

 		/**

@@ -2223,7 +2236,7 @@ public class ExtendedPaletteContentPage extends WizardPage implements Listener {
 										HashMap properties = new HashMap();

 										ArrayList<String> stereotypesQNToApply = new ArrayList<String>();

 										properties.put(IPapyrusPaletteConstant.ASPECT_ACTION_KEY, StereotypeAspectActionProvider.createConfigurationNode(stereotype.getQualifiedName()));

-										AspectCreationEntry aspectEntry = new AspectCreationEntry(stereotype.getName() + " (" + entry.getLabel() + ")", "Create an element with a stereotype", entry.getId() + "_" + System.currentTimeMillis(), entry.getSmallIcon(), (CombinedTemplateCreationEntry)entry, properties);

+										AspectCreationEntry aspectEntry = new AspectCreationEntry(stereotype.getName() + " (" + entry.getLabel() + ")", "Create an element with a stereotype", entry.getId() + "_" + System.currentTimeMillis(), entry.getSmallIcon(), entry, properties);

 										entries.add(aspectEntry);

 									}

 								}

@@ -2233,8 +2246,9 @@ public class ExtendedPaletteContentPage extends WizardPage implements Listener {
 					}

 				}

 				return entries.toArray();

-			} else

+			} else {

 				return new Object[0];

+			}

 		}

 

 		/**

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/ExtendedPaletteInformationPage.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/ExtendedPaletteInformationPage.java
index ee75e351a03..070f6755321 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/ExtendedPaletteInformationPage.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/ExtendedPaletteInformationPage.java
@@ -1,6 +1,6 @@
 /*****************************************************************************

  * Copyright (c) 2009 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

@@ -289,6 +289,7 @@ public class ExtendedPaletteInformationPage extends WizardPage implements Listen
 		advancedButton.setLayoutData(data);

 		advancedButton.addSelectionListener(new SelectionAdapter() {

 

+			@Override

 			public void widgetSelected(SelectionEvent e) {

 				handleAdvancedButtonSelect();

 			}

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/LocalPaletteContentPage.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/LocalPaletteContentPage.java
index 1ed869310fb..33533015f24 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/LocalPaletteContentPage.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/LocalPaletteContentPage.java
@@ -1,6 +1,6 @@
 /*****************************************************************************

  * Copyright (c) 2009 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

@@ -276,7 +276,7 @@ public class LocalPaletteContentPage extends WizardPage implements Listener {
 		// create Palette Group

 		createPalettePreviewGroup();

 

-		// create tool description group (custom name, description, and perhaphs icon.... Just under this group, another one with aspect actions) 

+		// create tool description group (custom name, description, and perhaphs icon.... Just under this group, another one with aspect actions)

 		createToolDescriptionGroup();

 

 		// just under, creates a new line of composites...

@@ -472,7 +472,7 @@ public class LocalPaletteContentPage extends WizardPage implements Listener {
 				// get the elements from the drag listener (either a palette entry or a palette

 				// entry proxy)

 				IStructuredSelection transferedSelection = (IStructuredSelection)LocalSelectionTransfer.getTransfer().nativeToJava(event.currentDataType);

-				Object entry = ((IStructuredSelection)transferedSelection).getFirstElement();

+				Object entry = transferedSelection.getFirstElement();

 

 				// creates the proxy for the element to be dropped

 				PaletteEntryProxy entryProxy = createNodeFromEntry(entry);

@@ -492,8 +492,8 @@ public class LocalPaletteContentPage extends WizardPage implements Listener {
 					if(entryProxy.getParent() != null) {

 						entryProxy.getParent().removeChild(entryProxy);

 					}

-					((PaletteEntryProxy)target).getParent().addChild(entryProxy, ((PaletteEntryProxy)target));

-					paletteTreeViewer.expandToLevel(((PaletteEntryProxy)target).getParent(), 1);

+					target.getParent().addChild(entryProxy, target);

+					paletteTreeViewer.expandToLevel(target.getParent(), 1);

 				} else {

 					// add to parent...

 					target.getParent().addChild(entryProxy);

@@ -566,7 +566,7 @@ public class LocalPaletteContentPage extends WizardPage implements Listener {
 	 */

 	protected void checkSelectionForDrop(IStructuredSelection transferedSelection, TreeItem item, DropTargetEvent event) {

 		event.detail = DND.DROP_NONE;

-		Object entry = ((IStructuredSelection)transferedSelection).getFirstElement();

+		Object entry = transferedSelection.getFirstElement();

 		// handle only first selected element

 		if(item == null) {

 			// adding to the root, should only be a drawer

@@ -2025,6 +2025,7 @@ public class LocalPaletteContentPage extends WizardPage implements Listener {
 		/**

 		 * {@inheritDoc}

 		 */

+		@Override

 		public int compare(Viewer testViewer, Object e1, Object e2) {

 			String label1 = "";

 			String label2 = "";

@@ -2040,10 +2041,12 @@ public class LocalPaletteContentPage extends WizardPage implements Listener {
 				label2 = ((Stereotype)e2).getName();

 			}

 

-			if(label1 == null)

+			if(label1 == null) {

 				return 1;

-			if(label2 == null)

+			}

+			if(label2 == null) {

 				return -1;

+			}

 

 			return label1.compareTo(label2);

 		}

@@ -2159,7 +2162,7 @@ public class LocalPaletteContentPage extends WizardPage implements Listener {
 										HashMap properties = new HashMap();

 										properties.put(IPapyrusPaletteConstant.ASPECT_ACTION_KEY, StereotypeAspectActionProvider.createConfigurationNode(stereotype.getQualifiedName()));

 										AspectCreationEntry aspectEntry = new AspectCreationEntry(stereotype.getName() + " (" + entry.getLabel() + ")", "Create an element with a stereotype", entry.getId() + "_" + System.currentTimeMillis(), entry.getSmallIcon(), (CombinedTemplateCreationEntry)entry, properties);

-										entries.add((PaletteEntry)aspectEntry);

+										entries.add(aspectEntry);

 									}

 								}

 

@@ -2168,8 +2171,9 @@ public class LocalPaletteContentPage extends WizardPage implements Listener {
 					}

 				}

 				return entries.toArray();

-			} else

+			} else {

 				return new Object[0];

+			}

 		}

 

 		/**

@@ -2272,7 +2276,7 @@ public class LocalPaletteContentPage extends WizardPage implements Listener {
 										HashMap properties = new HashMap();

 										ArrayList<String> stereotypesQNToApply = new ArrayList<String>();

 										properties.put(IPapyrusPaletteConstant.ASPECT_ACTION_KEY, StereotypeAspectActionProvider.createConfigurationNode(stereotype.getQualifiedName()));

-										AspectCreationEntry aspectEntry = new AspectCreationEntry(stereotype.getName() + " (" + entry.getLabel() + ")", "Create an element with a stereotype", entry.getId() + "_" + System.currentTimeMillis(), entry.getSmallIcon(), (CombinedTemplateCreationEntry)entry, properties);

+										AspectCreationEntry aspectEntry = new AspectCreationEntry(stereotype.getName() + " (" + entry.getLabel() + ")", "Create an element with a stereotype", entry.getId() + "_" + System.currentTimeMillis(), entry.getSmallIcon(), entry, properties);

 										entries.add(aspectEntry);

 									}

 								}

@@ -2282,8 +2286,9 @@ public class LocalPaletteContentPage extends WizardPage implements Listener {
 					}

 				}

 				return entries.toArray();

-			} else

+			} else {

 				return new Object[0];

+			}

 		}

 

 		/**

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/LocalPaletteInformationPage.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/LocalPaletteInformationPage.java
index 973234ca84f..06435d62f41 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/LocalPaletteInformationPage.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/LocalPaletteInformationPage.java
@@ -1,6 +1,6 @@
 /*****************************************************************************

  * Copyright (c) 2009 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

@@ -302,6 +302,7 @@ public class LocalPaletteInformationPage extends WizardPage implements Listener
 		advancedButton.setLayoutData(data);

 		advancedButton.addSelectionListener(new SelectionAdapter() {

 

+			@Override

 			public void widgetSelected(SelectionEvent e) {

 				handleAdvancedButtonSelect();

 			}

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteAspectToolEntryProxy.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteAspectToolEntryProxy.java
index cad63a2b3e9..0a2f8f5e657 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteAspectToolEntryProxy.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteAspectToolEntryProxy.java
@@ -1,6 +1,6 @@
 /*****************************************************************************

  * Copyright (c) 2009 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

@@ -158,6 +158,7 @@ public class PaletteAspectToolEntryProxy extends PaletteEntryProxy implements IP
 	 * 

 	 * @return the small icon of the cached entry

 	 */

+	@Override

 	public Image getImage() {

 		if(getImagePath() != null && !getImagePath().equals("")) {

 			return Activator.getPluginIconImage(Activator.ID, getImagePath());

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteEntryProxy.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteEntryProxy.java
index bac885bd890..2279ce26dc4 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteEntryProxy.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteEntryProxy.java
@@ -1,6 +1,6 @@
 /*****************************************************************************

  * Copyright (c) 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

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteEntryProxyInformationComposite.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteEntryProxyInformationComposite.java
index df5c27f6fe4..97e1dded527 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteEntryProxyInformationComposite.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteEntryProxyInformationComposite.java
@@ -1,6 +1,6 @@
 /*****************************************************************************

  * Copyright (c) 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

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteLocalDrawerProxy.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteLocalDrawerProxy.java
index 7eb87f859b3..8efeabee645 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteLocalDrawerProxy.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteLocalDrawerProxy.java
@@ -1,6 +1,6 @@
 /*****************************************************************************

  * Copyright (c) 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

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteLocalSeparatorProxy.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteLocalSeparatorProxy.java
index 58b5acded28..f2de8ef70a9 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteLocalSeparatorProxy.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteLocalSeparatorProxy.java
@@ -1,6 +1,6 @@
 /*****************************************************************************

  * Copyright (c) 2009 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

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteLocalStackProxy.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteLocalStackProxy.java
index 605ae9c69c8..eb1a953c096 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteLocalStackProxy.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PaletteLocalStackProxy.java
@@ -1,6 +1,6 @@
 /*****************************************************************************

  * Copyright (c) 2009 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

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PapyrusPaletteCustomizerDialog.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PapyrusPaletteCustomizerDialog.java
index ed6a077d17d..37e0ecf78c2 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PapyrusPaletteCustomizerDialog.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/PapyrusPaletteCustomizerDialog.java
@@ -1,6 +1,6 @@
 /*****************************************************************************

  * Copyright (c) 2009 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

@@ -45,7 +45,7 @@ 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.sasheditor.editor.ISashWindowsContainer;

+import org.eclipse.papyrus.infra.core.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;

@@ -527,7 +527,7 @@ public class PapyrusPaletteCustomizerDialog extends PaletteCustomizerDialogEx im
 	 * @param firstElement

 	 */

 	protected void editExtendedPalette(ExtendedProviderDescriptor descriptor) {

-		// check the file in plugin state area. 

+		// check the file in plugin state area.

 		String contributionID = descriptor.getContributionID();

 		String paletteRedefinition = PapyrusPalettePreferences.getPaletteRedefinition(contributionID);

 

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/UpdateLocalPaletteWizard.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/UpdateLocalPaletteWizard.java
index 73d5b3d45ca..e1e834135c0 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/UpdateLocalPaletteWizard.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/dialog/UpdateLocalPaletteWizard.java
@@ -1,6 +1,6 @@
 /*****************************************************************************

  * Copyright (c) 2009 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

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/proxies/XMLDefinitionPaletteProxyFactory.java b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/proxies/XMLDefinitionPaletteProxyFactory.java
index 4fecc58da26..d06ea75e339 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/proxies/XMLDefinitionPaletteProxyFactory.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/src/org/eclipse/papyrus/customization/palette/proxies/XMLDefinitionPaletteProxyFactory.java
@@ -1,6 +1,6 @@
 /*****************************************************************************

  * Copyright (c) 2009 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

@@ -17,13 +17,13 @@ import java.util.HashMap;
 import java.util.Map;

 

 import org.eclipse.gef.palette.PaletteEntry;

-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.Activator;

 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;