Bug 515235 - [Architecture Framework] Palette Configuration shall be

have a better integration to AF

 - add a property palettes in Meta model
 - remove old customePalette in Meta model
 - the palette application filter should be done with the name of the
PapyrusDiagram defined in the architecture (currently the key, hopfully
will be changed for an id field)

Change-Id: I7a4163874bbb94f92bd76043d956ee8e79b4a6bb

35 files changed, 1248 insertions, 895 deletions

diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/plugin/plugin.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/plugin/plugin.xtend
index 25e1c5c7679..2abe1a642cb 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/plugin/plugin.xtend
+++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/plugin/plugin.xtend
@@ -74,7 +74,7 @@ import java.io.File
 		«xptActionExtension.Main(it.editorGen)»
 		«additions(it)»

 		«notationTypesMap(editorGen)»

-		«paletteConfiguration(editorGen)»

+«««		«paletteConfiguration(editorGen)»

 		</plugin>
 	'''

 	

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml
index d945133ade2..8a6475ac7a5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml
@@ -484,5 +484,11 @@
          </dependsOn>
       </service>
    </extension>
+   <extension
+         point="org.eclipse.papyrus.infra.architecture.listeners">
+      <listener
+            class="org.eclipse.papyrus.infra.gmfdiag.common.service.palette.ArchitectureForPaletteServiceListener">
+      </listener>
+   </extension>
 
 </plugin>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/ArchitectureExtendedPaletteProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/ArchitectureExtendedPaletteProvider.java
new file mode 100644
index 00000000000..eb5a2ca8d46
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/ArchitectureExtendedPaletteProvider.java
@@ -0,0 +1,55 @@
+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST, ALL4TEC and others.
+ * 
+ * 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.service.palette;
+
+import java.io.IOException;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.gmf.runtime.diagram.ui.services.palette.IPaletteProvider;
+import org.eclipse.papyrus.infra.gmfdiag.common.Activator;
+
+/**
+ * Palette provider to be used for palettes defined by models, when they are defined with an Architecture model.
+ */
+public class ArchitectureExtendedPaletteProvider extends ExtendedPluginPaletteProvider implements IPaletteProvider {
+
+	/**
+	 * Constructor.
+	 */
+	public ArchitectureExtendedPaletteProvider() {
+	}
+
+	/**
+	 * Set the contributions.
+	 * 
+	 * @param descriptor
+	 *            The contribution descriptor
+	 */
+	public void setContributions(final ArchitectureExtendedProviderDescriptor descriptor) {
+		Assert.isNotNull(descriptor);
+		contributorID = descriptor.getContributionID();
+
+		Resource resource = loadResourceFromPreferences(new ResourceSetImpl());
+		if (null != resource) {
+			// contribution have been redefined
+			try {
+				contributions = loadConfigurationModel(resource);
+			} catch (IOException e) {
+				Activator.log.error(e);
+			}
+		} else {
+			contributions = descriptor.getDiagram().getPalettes();
+		}
+	}
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/ArchitectureExtendedProviderDescriptor.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/ArchitectureExtendedProviderDescriptor.java
new file mode 100644
index 00000000000..acb05b3f0c7
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/ArchitectureExtendedProviderDescriptor.java
@@ -0,0 +1,420 @@
+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST, ALL4TEC and others.
+ * 
+ * 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.service.palette;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.gmf.runtime.common.core.service.IOperation;
+import org.eclipse.gmf.runtime.common.core.service.IProvider;
+import org.eclipse.gmf.runtime.common.core.service.ProviderPriority;
+import org.eclipse.gmf.runtime.common.ui.util.ActivityUtil;
+import org.eclipse.gmf.runtime.diagram.ui.internal.services.palette.ContributeToPaletteOperation;
+import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditorWithFlyOutPalette;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.infra.architecture.ArchitectureDescriptionUtils;
+import org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
+import org.eclipse.papyrus.infra.gmfdiag.common.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.common.service.palette.PapyrusPaletteService.ExtendedProviderDescriptor;
+import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteConfiguration;
+import org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram;
+import org.eclipse.papyrus.infra.gmfdiag.style.PapyrusDiagramStyle;
+import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
+import org.eclipse.ui.IEditorPart;
+import org.osgi.framework.Bundle;
+
+/**
+ * ProviderDescriptor for palette model defined in Architecture models.
+ */
+public class ArchitectureExtendedProviderDescriptor extends ExtendedProviderDescriptor {
+
+	/**
+	 * Suffix for name for palette defined in Architecture model.
+	 */
+	public static final String ARCHITECTURE_PALETTE_NAME_SUFFIX = " Palette";//$NON-NLS-1$
+
+	/**
+	 * Suffix for id for palette defined in Architecture model.
+	 */
+	public static final String ARCHITECTURE_PALETTE_ID_SUFFIX = "_Palette";//$NON-NLS-1$
+
+	/** The PapyrusDiagram target */
+	private PapyrusDiagram diagram;
+
+	/**
+	 * Constructor.
+	 * 
+	 * @param diagram
+	 *            the PapyrusDiagram target
+	 */
+	public ArchitectureExtendedProviderDescriptor(final PapyrusDiagram diagram) {
+		super(null);
+		Assert.isNotNull(diagram);
+		this.diagram = diagram;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.service.palette.PapyrusPaletteService.ProviderDescriptor#getProvider()
+	 */
+	@Override
+	public IProvider getProvider() {
+		if (null == provider) {
+			provider = new ArchitectureExtendedPaletteProvider();
+			((ArchitectureExtendedPaletteProvider) provider).setContributions(this);
+		}
+		return provider;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.service.palette.PapyrusPaletteService.ProviderDescriptor#hasOnlyEntriesDefinition()
+	 */
+	@Override
+	public boolean hasOnlyEntriesDefinition() {
+		return false;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.service.palette.PapyrusPaletteService.ProviderDescriptor#getContributionName()
+	 */
+	@Override
+	public String getContributionName() {
+		return getDiagram().getName() + ARCHITECTURE_PALETTE_NAME_SUFFIX;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getContributionID() {
+		return getDiagram().getName() + ARCHITECTURE_PALETTE_ID_SUFFIX;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.service.palette.PapyrusPaletteService.ProviderDescriptor#getPriority()
+	 */
+	@Override
+	public ProviderPriority getPriority() {
+		return ProviderPriority.MEDIUM;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.service.palette.PapyrusPaletteService.ProviderDescriptor#provides(org.eclipse.gmf.runtime.common.core.service.IOperation)
+	 */
+	@SuppressWarnings("restriction")
+	@Override
+	public boolean provides(IOperation operation) {
+		Boolean provides = false;
+		if (operation instanceof ContributeToPaletteOperation) {
+			ContributeToPaletteOperation o = (ContributeToPaletteOperation) operation;
+			IEditorPart part = o.getEditor();
+			if (part instanceof DiagramEditorWithFlyOutPalette) {
+				String diagramName = getDiagram().getName(); // name is the key of modelkind
+				if (diagramName != null) {
+					Diagram diagramPalette = ((DiagramEditorWithFlyOutPalette) part).getDiagram();
+					PapyrusDiagramStyle papyrusDiagramStyle = org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils.getPapyrusDiagramStyle(diagramPalette);
+					if (papyrusDiagramStyle != null && diagramName.equals(papyrusDiagramStyle.getDiagramKind().getName())) {
+						if (!isHidden(o)) {
+							ModelSet modelSet = null;
+							try {
+								// Find out if a viewpoint refers the palettes diagram.
+								modelSet = ServiceUtils.getInstance().getModelSet(part.getAdapter(ServicesRegistry.class));
+								List<?> collect = new ArchitectureDescriptionUtils(modelSet).getArchitectureViewpoints().stream()// gets Viewpoints
+										.flatMap(p -> p.getRepresentationKinds().stream())// get representation kinds from viewpoint
+										.filter(PapyrusDiagram.class::isInstance).map(PapyrusDiagram.class::cast)// filter on diagram type
+										.filter(p -> getDiagram().getQualifiedName().equals(p.getQualifiedName()))
+										.flatMap(p -> p.getPalettes().stream()).distinct()// Get paletteConf
+										.collect(Collectors.toList());// as list
+								provides = !collect.isEmpty();
+
+							} catch (ServiceException e) {
+								Activator.log.error("Can't get model set", e);
+							}
+						}
+					}
+				}
+			}
+		}
+
+		return provides;
+	}
+
+	/**
+	 * checks if this provider is providing elements, even if this should be
+	 * hidden
+	 *
+	 * @param operation
+	 *            the operation to contribute
+	 * @return <code>true</code> if this provider contributes to the
+	 *         operation
+	 */
+	public boolean providesWithVisibility(ContributeToPaletteOperation operation) {
+		/**
+		 * @see org.eclipse.gmf.runtime.common.core.service.IProvider#provides(org.eclipse.gmf.runtime.common.core.service.IOperation)
+		 */
+		boolean isEnable = ActivityUtil.isEnabled(getContributionID(), Activator.ID);
+
+		if (!isEnable) {
+			return false;
+		}
+		// => Remove the test
+		if (operation instanceof ContributeToPaletteOperation) {
+			ContributeToPaletteOperation o = operation;
+
+			IEditorPart part = o.getEditor();
+			if (!(part instanceof DiagramEditorWithFlyOutPalette)) {
+				return false;
+			}
+
+			// will never work, ID of the site is the multi diagram
+			// editor...
+			if (getDiagram().getImplementationID() != null) {
+				if (!getDiagram().getImplementationID().equals(((DiagramEditorWithFlyOutPalette) part).getDiagram().getType())) {
+					return false;
+				}
+			}
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Reads the configuration file in the bundle
+	 *
+	 * @param bundle
+	 * @param filePath
+	 * @return
+	 */
+	protected InputStream openConfigurationFile(Bundle bundle, String filePath) {
+		try {
+			URL urlFile = bundle.getEntry(filePath);
+			urlFile = FileLocator.resolve(urlFile);
+			urlFile = FileLocator.toFileURL(urlFile);
+			if ("file".equals(urlFile.getProtocol())) { //$NON-NLS-1$
+				return new FileInputStream(urlFile.getFile());
+			} else if ("jar".equals(urlFile.getProtocol())) { //$NON-NLS-1$
+				String path = urlFile.getPath();
+				if (path.startsWith("file:")) {//$NON-NLS-1$
+					// strip off the file: and the !/
+					int jarPathEndIndex = path.indexOf("!/");
+					if (jarPathEndIndex < 0) {
+						Activator.log.error("Impossible to find the jar path end", null);
+						return null;
+					}
+					String jarPath = path.substring("file:".length(), jarPathEndIndex);
+					ZipFile zipFile = new ZipFile(jarPath);
+					filePath = filePath.substring(jarPathEndIndex + 2, path.length());
+					ZipEntry entry = zipFile.getEntry(path);
+					return zipFile.getInputStream(entry);
+					// return new File(filePath);
+				}
+			}
+		} catch (IOException e) {
+			Activator.log.error("Impossible to find initial file", e);
+		}
+		return null;
+	}
+
+	/**
+	 * the bundle entry protocol prefix
+	 */
+	private static final String BUNDLEENTRY_PROTOCOL = "bundleentry://"; //$NON-NLS-1$
+
+	/**
+	 * the plateform protocol prefix
+	 */
+	private static final String PLUGIN_PROTOCOL = "platform:/plugin/"; //$NON-NLS-1$ ;
+
+	private static String retrieveBundleId(final String initialValue) {
+		String result = null;
+		if (initialValue.startsWith(PLUGIN_PROTOCOL)) {
+			String tmp = initialValue.substring(PLUGIN_PROTOCOL.length());
+			int bundleIdEndIndex = tmp.indexOf("/");//$NON-NLS-1$
+			result = tmp.substring(0, bundleIdEndIndex);
+		} else if (initialValue.startsWith(BUNDLEENTRY_PROTOCOL)) {
+
+			String absolutePath = null;
+			try {
+				URL url = new URL(initialValue);
+				absolutePath = FileLocator.resolve(url).getPath();
+			} catch (MalformedURLException e) {
+			} catch (IOException e) {
+			}
+
+			// Remove the local path (/icons/obj16/ContainmentConnection.gif)
+			int bundleIdEndIndex = absolutePath.indexOf("/");//$NON-NLS-1$
+			result = absolutePath.substring(0, bundleIdEndIndex);
+
+			if (-1 != result.indexOf("/")) {//$NON-NLS-1$
+				result = result.substring(result.lastIndexOf("/") + 1);//$NON-NLS-1$
+			}
+
+		}
+		return result;
+	}
+
+	/**
+	 * @return
+	 */
+	public String createLocalRedefinition() {
+		PaletteConfiguration paletteConfiguration = getDiagram().getPalettes().get(0);
+		URI uri = EcoreUtil.getURI(paletteConfiguration).trimFragment();
+
+		String localRedifinitionPath = uri.toPlatformString(true);
+
+		InputStream stream = null;
+		String filePath = localRedifinitionPath.substring(1, localRedifinitionPath.length());
+		int indexOf = filePath.indexOf(IPath.SEPARATOR);
+		String bundleId = filePath.substring(0, indexOf);
+		filePath = filePath.substring(indexOf, filePath.length());
+
+		String realId = bundleId;
+		Bundle bundle = Platform.getBundle(bundleId);
+		//
+		// getBundle
+		if (Platform.isFragment(bundle)) {
+			// retrieve the file in the fragment itself
+			stream = openConfigurationFile(bundle, filePath);
+		} else {
+			// this is a plugin. Search in sub fragments, then in the plugin
+			Bundle[] fragments = Platform.getFragments(bundle);
+			// no fragment, so the file should be in the plugin itself
+			if (fragments == null) {
+				stream = openConfigurationFile(bundle, filePath);
+			} else {
+				for (Bundle fragment : fragments) {
+					if (stream == null) {
+						stream = openConfigurationFile(fragment, filePath);
+						realId = fragment.getSymbolicName();
+					}
+				}
+
+				if (stream == null) {
+					// no file in fragments. open in the plugin itself
+					stream = openConfigurationFile(bundle, filePath);
+					realId = bundle.getSymbolicName();
+				}
+			}
+		}
+
+		// check the stream
+		if (stream == null) {
+			Activator.log.error("Impossible to read initial file", null);
+			return null;
+		}
+
+		File stateLocationRootFile = Activator.getInstance().getStateLocation().toFile();
+		File bundleFolder = new File(stateLocationRootFile, realId);
+		bundleFolder.mkdir();
+
+		// for all intermediate folders in filePath, create a folder in
+		// plugin state location
+		File root = bundleFolder;
+		// Split folder with / or \ file separator
+		String[] folders = filePath.split("\\Q\\\\E|\\Q/\\E");//$NON-NLS-1$
+		for (int i = 0; i < folders.length - 1; i++) { // all intermediate
+			// folders. Last one
+			// is the file name
+			// itself...
+			String folderName = folders[i];
+			if (null != folderName && folderName.length() != 0) {
+				File newFolder = new File(root, folders[i]);
+				newFolder.mkdir();
+				root = newFolder;
+			}
+		}
+
+		File newFile = new File(root, folders[folders.length - 1]);
+		boolean fileCreated = false;
+
+		// check if file already exists or not
+		if (newFile.exists()) {
+			fileCreated = true;
+		} else {
+			try {
+				fileCreated = newFile.createNewFile();
+			} catch (IOException e) {
+				Activator.log.error("Impossible to create new file", e);
+				return null;
+			}
+		}
+
+		if (!fileCreated) {
+			Activator.log.error("It was not possible to create the file", null);
+			return null;
+		}
+
+		try {
+			FileOutputStream fileOutputStream = new FileOutputStream(newFile);
+			byte[] buf = new byte[1024];
+			int len;
+			while ((len = stream.read(buf)) > 0) {
+				fileOutputStream.write(buf, 0, len);
+			}
+			stream.close();
+			fileOutputStream.close();
+		} catch (FileNotFoundException e) {
+			Activator.log.error("It was not possible to write in the file", e);//$NON-NLS-1$
+			return null;
+		} catch (IOException e) {
+			Activator.log.error("It was not possible to write in the file", e);//$NON-NLS-1$
+			return null;
+		}
+
+		// Needs to add a / to have a correct path or the concatenation will be false.
+		if (!filePath.startsWith("/") || !filePath.startsWith("\\")) {//$NON-NLS-1$ //$NON-NLS-2$
+			filePath = IPath.SEPARATOR + filePath;
+		}
+
+		// return realId + filePath;
+		return localRedifinitionPath;
+	}
+
+	/**
+	 * @return the diagram
+	 */
+	public PapyrusDiagram getDiagram() {
+		return diagram;
+	}
+
+}
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/ArchitectureForPaletteServiceListener.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/ArchitectureForPaletteServiceListener.java
new file mode 100644
index 00000000000..3aaa3f800d2
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/ArchitectureForPaletteServiceListener.java
@@ -0,0 +1,43 @@
+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST, ALL4TEC and others.
+ * 
+ * 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.gmfdiag.common.service.palette;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.papyrus.infra.architecture.listeners.IArchitectureDescriptionListener;
+
+/**
+ * {@link IArchitectureDescriptionListener} which inform {@link PapyrusPaletteService} that architecture have changed.
+ */
+public class ArchitectureForPaletteServiceListener implements IArchitectureDescriptionListener {
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.architecture.listeners.IArchitectureDescriptionListener#architectureContextChanged(org.eclipse.emf.common.notify.Notification)
+	 */
+	@Override
+	public void architectureContextChanged(final Notification notification) {
+		PapyrusPaletteService.getInstance().architectureChanged();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.papyrus.infra.architecture.listeners.IArchitectureDescriptionListener#architectureViewpointsChanged(org.eclipse.emf.common.notify.Notification)
+	 */
+	@Override
+	public void architectureViewpointsChanged(final Notification notification) {
+		PapyrusPaletteService.getInstance().architectureChanged();
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPalettePreferences.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPalettePreferences.java
index 16315ff2edd..07db8b3114d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPalettePreferences.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPalettePreferences.java
@@ -8,7 +8,7 @@
  *
  * Contributors:
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- *  Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - bug 512343.
+ *  Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - bug 512343.
  *
  *****************************************************************************/
 package org.eclipse.papyrus.infra.gmfdiag.common.service.palette;
@@ -451,7 +451,7 @@ public class PapyrusPalettePreferences implements IPapyrusPaletteConstant {
 				return XMLMemento.createWriteRoot(EXTENDED_PALETTE_WORKSPACE_DEFINITIONS);
 			}
 		} catch (WorkbenchException e) {
-			Activator.getInstance().logError(Messages.PapyrusPalettePreferences_Error_ImpossibleToReadPreferences, e); //$NON-NLS-1$
+			Activator.getInstance().logError(Messages.PapyrusPalettePreferences_Error_ImpossibleToReadPreferences, e);
 		}
 		return null;
 	}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPaletteService.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPaletteService.java
index c24114b221b..7e88ff5d8ba 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPaletteService.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPaletteService.java
@@ -27,12 +27,14 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener;
@@ -66,9 +68,12 @@ import org.eclipse.gmf.runtime.diagram.ui.services.palette.IPaletteProvider;
 import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteService;
 import org.eclipse.gmf.runtime.diagram.ui.services.palette.SelectionToolEx;
 import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.infra.architecture.ArchitectureDomainManager;
+import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureDescriptionLanguage;
 import org.eclipse.papyrus.infra.gmfdiag.common.Activator;
 import org.eclipse.papyrus.infra.gmfdiag.common.messages.Messages;
 import org.eclipse.papyrus.infra.gmfdiag.common.service.palette.XMLPaletteProviderConfiguration.EditorDescriptor;
+import org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram;
 import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
 import org.eclipse.ui.IEditorPart;
 import org.osgi.framework.Bundle;
@@ -82,6 +87,11 @@ import org.osgi.framework.Bundle;
 public class PapyrusPaletteService extends PaletteService implements IPaletteProvider, IPapyrusPaletteConstant, IPreferenceChangeListener {
 
 	/**
+	 * Extension point is of palette providers.
+	 */
+	public static final String PALETTE_PROVIDERS = "paletteProviders"; //$NON-NLS-1$
+
+	/**
 	 * A descriptor for palette providers defined by a configuration element.
 	 */
 	public static class ProviderDescriptor extends ActivityFilterProviderDescriptor {
@@ -226,11 +236,6 @@ public class PapyrusPaletteService extends PaletteService implements IPalettePro
 					return false;
 				}
 
-				// TODO find a way to manage it
-				// if (!PaletteUtil.areRequiredProfileApplied(part, this)) {
-				// return false;
-				// }
-
 				return true;
 			}
 
@@ -426,7 +431,7 @@ public class PapyrusPaletteService extends PaletteService implements IPalettePro
 
 			// Needs to add a / to have a correct path or the concatenation will be false.
 			if (!filePath.startsWith("/") || !filePath.startsWith("\\")) {//$NON-NLS-1$ //$NON-NLS-2$
-				filePath = File.separator + filePath;
+				filePath = IPath.SEPARATOR + filePath;
 			}
 
 			return realId + filePath;
@@ -659,6 +664,9 @@ public class PapyrusPaletteService extends PaletteService implements IPalettePro
 
 	}
 
+	/**
+	 * ProviderDescriptor for workspace palette model.
+	 */
 	public static class WorkspaceExtendedProviderDescriptor extends LocalProviderDescriptor {
 		/**
 		 * @param description
@@ -680,10 +688,10 @@ public class PapyrusPaletteService extends PaletteService implements IPalettePro
 		}
 	}
 
+
+
 	/**
-	 * 
 	 * Provider Descriptor for extended palette defined locally (ie not in workspace)
-	 *
 	 */
 	public static class LocalExtendedProviderDescriptor extends LocalProviderDescriptor {
 		/**
@@ -761,6 +769,35 @@ public class PapyrusPaletteService extends PaletteService implements IPalettePro
 	}
 
 	/**
+	 * Add providers for palettes based on model declared in architecture.
+	 */
+	protected void configureArchitectureExtendedPalettes() {
+
+		// remove all local descriptors
+		for (org.eclipse.gmf.runtime.common.core.service.Service.ProviderDescriptor descriptor : getProviders()) {
+			if (descriptor instanceof ArchitectureExtendedProviderDescriptor) {
+				removeProvider(descriptor);
+			}
+		}
+
+		// get all PapyrusDiagram declare in architecture
+		List<PapyrusDiagram> papyrusDiagrams = ArchitectureDomainManager.getInstance().getVisibleArchitectureContexts().stream()
+				.filter(MergedArchitectureDescriptionLanguage.class::isInstance)
+				.map(MergedArchitectureDescriptionLanguage.class::cast)
+				.flatMap(adl -> adl.getRepresentationKinds().stream())
+				.filter(PapyrusDiagram.class::isInstance)
+				.map(PapyrusDiagram.class::cast)
+				.filter(d -> !d.getPalettes().isEmpty())
+				.collect(Collectors.toList());
+
+
+		for (PapyrusDiagram diagram : papyrusDiagrams) {
+			ArchitectureExtendedProviderDescriptor descriptor = new ArchitectureExtendedProviderDescriptor(diagram);
+			addProvider(ProviderPriority.MEDIUM, descriptor);
+		}
+	}
+
+	/**
 	 * add providers for workspace palettes based on model
 	 */
 	protected void configureRedefinedPalettes() {
@@ -785,11 +822,12 @@ public class PapyrusPaletteService extends PaletteService implements IPalettePro
 	 * Configure providers.
 	 */
 	private static void configureProviders() {
-		getInstance().configureProviders(DiagramUIPlugin.getPluginId(), "paletteProviders"); //$NON-NLS-1$
+		getInstance().configureProviders(DiagramUIPlugin.getPluginId(), PALETTE_PROVIDERS);
 		getInstance().configureProviders(Activator.ID, PALETTE_DEFINITION);
 		getInstance().configureWorkspaceExtendedPalettes();
 		getInstance().configureLocalExtendedPalettes();
 		getInstance().configureRedefinedPalettes();
+		getInstance().configureArchitectureExtendedPalettes();
 	}
 
 	/**
@@ -1102,6 +1140,14 @@ public class PapyrusPaletteService extends PaletteService implements IPalettePro
 	}
 
 	/**
+	 * Notification that the architecture have changed.
+	 */
+	public void architectureChanged() {
+		getInstance().configureArchitectureExtendedPalettes();
+		providerChanged(new ProviderChangeEvent(getInstance()));
+	}
+
+	/**
 	 * Notifies the listeners for this abstract provider that the specified
 	 * event has occurred.
 	 *
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/META-INF/MANIFEST.MF
index ceb334ca19c..4e781b66273 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/META-INF/MANIFEST.MF
@@ -8,16 +8,20 @@ Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.representation.provider.Repr
 Bundle-Vendor: %providerName

 Bundle-Localization: plugin

 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Export-Package: org.eclipse.papyrus.infra.gmfdiag.representation.provider

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.gmfdiag.representation;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.emf.edit;visibility:=reexport,

- org.eclipse.papyrus.infra.core.architecture;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.core.architecture.edit;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.constraints;visibility:=reexport;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.constraints.edit;visibility:=reexport;bundle-version="[2.0.0,3.0.0)",

- org.eclipse.papyrus.infra.types;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.types.edit;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.architecture.representation;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",

- org.eclipse.papyrus.infra.architecture.representation.edit;visibility:=reexport;bundle-version="[1.0.0,2.0.0)"

+Export-Package: org.eclipse.papyrus.infra.gmfdiag.representation.provider
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",

+ org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,

+ org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,

+ org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,

+ org.eclipse.papyrus.infra.core.architecture.edit;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,

+ org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

+ org.eclipse.papyrus.infra.constraints.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,

+ org.eclipse.emf.ecore;bundle-version="[2.13.0,3.0.0)";visibility:=reexport,

+ org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,

+ org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

+ org.eclipse.papyrus.infra.types.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

+ org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

+ org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,

+ org.eclipse.papyrus.infra.architecture.representation;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,

+ org.eclipse.papyrus.infra.architecture.representation.edit;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/plugin.properties
index a5ff4549eeb..70eed5792a0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/plugin.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/plugin.properties
@@ -31,7 +31,6 @@ _UI_Unknown_type = Object
 
 _UI_Unknown_datatype= Value
 
-_UI_PapyrusDiagram_customPalette_feature = Custom Palette
 _UI_PapyrusDiagram_customStyle_feature = Custom Style
 _UI_PapyrusDiagram_childRules_feature = Child Rules
 _UI_PapyrusDiagram_paletteRules_feature = Palette Rules
@@ -48,3 +47,4 @@ _UI_PathElement_target_feature = Target
 _UI_AssistantRule_elementTypeID_feature = Element Type ID
 _UI_Unknown_feature = Unspecified
 
+_UI_PapyrusDiagram_palettes_feature = Palettes
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/provider/PapyrusDiagramItemProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/provider/PapyrusDiagramItemProvider.java
index 50d8c9cb82e..320e45f626a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/provider/PapyrusDiagramItemProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/provider/PapyrusDiagramItemProvider.java
@@ -61,27 +61,27 @@ public class PapyrusDiagramItemProvider extends PapyrusRepresentationKindItemPro
 		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
-			addCustomPalettePropertyDescriptor(object);
 			addCustomStylePropertyDescriptor(object);
 			addCreationCommandClassPropertyDescriptor(object);
+			addPalettesPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
-	 * This adds a property descriptor for the Custom Palette feature.
+	 * This adds a property descriptor for the Custom Style feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected void addCustomPalettePropertyDescriptor(Object object) {
+	protected void addCustomStylePropertyDescriptor(Object object) {
 		itemPropertyDescriptors.add
 			(createItemPropertyDescriptor
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
-				 getString("_UI_PapyrusDiagram_customPalette_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_PapyrusDiagram_customPalette_feature", "_UI_PapyrusDiagram_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 RepresentationPackage.Literals.PAPYRUS_DIAGRAM__CUSTOM_PALETTE,
+				 getString("_UI_PapyrusDiagram_customStyle_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_PapyrusDiagram_customStyle_feature", "_UI_PapyrusDiagram_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 RepresentationPackage.Literals.PAPYRUS_DIAGRAM__CUSTOM_STYLE,
 				 true,
 				 false,
 				 false,
@@ -91,19 +91,19 @@ public class PapyrusDiagramItemProvider extends PapyrusRepresentationKindItemPro
 	}
 
 	/**
-	 * This adds a property descriptor for the Custom Style feature.
+	 * This adds a property descriptor for the Creation Command Class feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected void addCustomStylePropertyDescriptor(Object object) {
+	protected void addCreationCommandClassPropertyDescriptor(Object object) {
 		itemPropertyDescriptors.add
 			(createItemPropertyDescriptor
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
-				 getString("_UI_PapyrusDiagram_customStyle_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_PapyrusDiagram_customStyle_feature", "_UI_PapyrusDiagram_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 RepresentationPackage.Literals.PAPYRUS_DIAGRAM__CUSTOM_STYLE,
+				 getString("_UI_PapyrusDiagram_creationCommandClass_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_PapyrusDiagram_creationCommandClass_feature", "_UI_PapyrusDiagram_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 RepresentationPackage.Literals.PAPYRUS_DIAGRAM__CREATION_COMMAND_CLASS,
 				 true,
 				 false,
 				 false,
@@ -113,23 +113,23 @@ public class PapyrusDiagramItemProvider extends PapyrusRepresentationKindItemPro
 	}
 
 	/**
-	 * This adds a property descriptor for the Creation Command Class feature.
+	 * This adds a property descriptor for the Palettes feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected void addCreationCommandClassPropertyDescriptor(Object object) {
+	protected void addPalettesPropertyDescriptor(Object object) {
 		itemPropertyDescriptors.add
 			(createItemPropertyDescriptor
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
-				 getString("_UI_PapyrusDiagram_creationCommandClass_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_PapyrusDiagram_creationCommandClass_feature", "_UI_PapyrusDiagram_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 RepresentationPackage.Literals.PAPYRUS_DIAGRAM__CREATION_COMMAND_CLASS,
+				 getString("_UI_PapyrusDiagram_palettes_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_PapyrusDiagram_palettes_feature", "_UI_PapyrusDiagram_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 RepresentationPackage.Literals.PAPYRUS_DIAGRAM__PALETTES,
 				 true,
 				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 true,
+				 null,
 				 null,
 				 null));
 	}
@@ -200,7 +200,6 @@ public class PapyrusDiagramItemProvider extends PapyrusRepresentationKindItemPro
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(PapyrusDiagram.class)) {
-			case RepresentationPackage.PAPYRUS_DIAGRAM__CUSTOM_PALETTE:
 			case RepresentationPackage.PAPYRUS_DIAGRAM__CUSTOM_STYLE:
 			case RepresentationPackage.PAPYRUS_DIAGRAM__CREATION_COMMAND_CLASS:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/provider/RepresentationEditPlugin.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/provider/RepresentationEditPlugin.java
index ed568fb99e8..d6de805d25a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/provider/RepresentationEditPlugin.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/provider/RepresentationEditPlugin.java
@@ -17,10 +17,12 @@ import org.eclipse.emf.common.EMFPlugin;
 
 import org.eclipse.emf.common.util.ResourceLocator;
 
+import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
 import org.eclipse.papyrus.infra.constraints.provider.ConstraintsEditPlugin;
 
 import org.eclipse.papyrus.infra.core.architecture.provider.ArchitectureEditPlugin;
 
+import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.provider.PaletteConfigurationEditPlugin;
 import org.eclipse.papyrus.infra.types.provider.TypesConfigurationsEditPlugin;
 
 /**
@@ -57,7 +59,9 @@ public final class RepresentationEditPlugin extends EMFPlugin {
 		  (new ResourceLocator [] {
 		     ArchitectureEditPlugin.INSTANCE,
 		     ConstraintsEditPlugin.INSTANCE,
+		     EcoreEditPlugin.INSTANCE,
 		     TypesConfigurationsEditPlugin.INSTANCE,
+		     PaletteConfigurationEditPlugin.INSTANCE,
 		     org.eclipse.papyrus.infra.architecture.representation.provider.RepresentationEditPlugin.INSTANCE,
 		   });
 	}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/META-INF/MANIFEST.MF
index ba5d0a69229..2395b49bd9f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/META-INF/MANIFEST.MF
@@ -15,5 +15,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.infra.core.architecture;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",

  org.eclipse.papyrus.infra.constraints;visibility:=reexport;bundle-version="[2.0.0,3.0.0)",

  org.eclipse.papyrus.infra.types;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.infra.architecture.representation;visibility:=reexport;bundle-version="[1.0.0,2.0.0)"

+ org.eclipse.papyrus.infra.architecture.representation;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",

+ org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration;bundle-version="[3.0.0,4.0.0)";visibility:=reexport

 Bundle-ActivationPolicy: lazy

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.ecore b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.ecore
index db0a46e3490..f4b3792e410 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.ecore
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.ecore
@@ -3,7 +3,6 @@
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="representation" nsURI="http://www.eclipse.org/papyrus/infra/gmfdiag/representation"
     nsPrefix="gmfdiagrepresentation">
   <eClassifiers xsi:type="ecore:EClass" name="PapyrusDiagram" eSuperTypes="../../org.eclipse.papyrus.infra.architecture.representation/model/Representation.ecore#//PapyrusRepresentationKind">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="customPalette" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="customStyle" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="childRules" upperBound="-1"
         eType="#//ChildRule" containment="true">
@@ -28,6 +27,8 @@
         <eTypeArguments/>
       </eGenericType>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="palettes" upperBound="-1"
+        eType="ecore:EClass ../../org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/model/PaletteConfiguration.ecore#//PaletteConfiguration"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ChildRule" eSuperTypes="../../org.eclipse.papyrus.infra.architecture.representation/model/Representation.ecore#//Rule">
     <eStructuralFeatures xsi:type="ecore:EReference" name="element" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.genmodel b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.genmodel
index 62af9e4b00e..bc94c4ac06c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.genmodel
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.genmodel
@@ -8,19 +8,19 @@
     testsDirectory="/org.eclipse.papyrus.infra.gmfdiag.representation.tests/src-gen"
     importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
     editPluginID="org.eclipse.papyrus.infra.gmfdiag.representation.edit" editorPluginID="org.eclipse.papyrus.infra.gmfdiag.representation.editor"
-    usedGenPackages="../../org.eclipse.papyrus.infra.core.architecture/model/Architecture.genmodel#//architecture ../../org.eclipse.papyrus.infra.constraints/Model/Constraints.genmodel#//constraints ../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel#//types ../../org.eclipse.papyrus.infra.architecture.representation/model/Representation.genmodel#//representation"
+    usedGenPackages="../../org.eclipse.papyrus.infra.core.architecture/model/Architecture.genmodel#//architecture ../../org.eclipse.papyrus.infra.constraints/Model/Constraints.genmodel#//constraints ../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel#//types ../../org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration/model/PaletteConfiguration.genmodel#//paletteconfiguration ../../org.eclipse.papyrus.infra.architecture.representation/model/Representation.genmodel#//representation"
     operationReflection="true" importOrganizing="true">
   <foreignModel>GmfDiagRepresentation.ecore</foreignModel>
   <genPackages prefix="Representation" basePackage="org.eclipse.papyrus.infra.gmfdiag"
       disposableProviderFactory="true" childCreationExtenders="true" ecorePackage="GmfDiagRepresentation.ecore#/">
     <genDataTypes ecoreDataType="GmfDiagRepresentation.ecore#//ElementType"/>
     <genClasses ecoreClass="GmfDiagRepresentation.ecore#//PapyrusDiagram">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute GmfDiagRepresentation.ecore#//PapyrusDiagram/customPalette"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute GmfDiagRepresentation.ecore#//PapyrusDiagram/customStyle"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference GmfDiagRepresentation.ecore#//PapyrusDiagram/childRules"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference GmfDiagRepresentation.ecore#//PapyrusDiagram/paletteRules"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference GmfDiagRepresentation.ecore#//PapyrusDiagram/assistantRules"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute GmfDiagRepresentation.ecore#//PapyrusDiagram/creationCommandClass"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference GmfDiagRepresentation.ecore#//PapyrusDiagram/palettes"/>
     </genClasses>
     <genClasses ecoreClass="GmfDiagRepresentation.ecore#//ChildRule">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference GmfDiagRepresentation.ecore#//ChildRule/element"/>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/PapyrusDiagram.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/PapyrusDiagram.java
index 5fcbaf71c45..3e1ad7993c9 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/PapyrusDiagram.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/PapyrusDiagram.java
@@ -16,6 +16,7 @@ package org.eclipse.papyrus.infra.gmfdiag.representation;
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind;
+import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteConfiguration;
 
 /**
  * <!-- begin-user-doc -->
@@ -26,12 +27,12 @@ import org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentati
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#getCustomPalette <em>Custom Palette</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#getCustomStyle <em>Custom Style</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#getChildRules <em>Child Rules</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#getPaletteRules <em>Palette Rules</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#getAssistantRules <em>Assistant Rules</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#getCreationCommandClass <em>Creation Command Class</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#getPalettes <em>Palettes</em>}</li>
  * </ul>
  *
  * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getPapyrusDiagram()
@@ -40,32 +41,6 @@ import org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentati
  */
 public interface PapyrusDiagram extends PapyrusRepresentationKind {
 	/**
-	 * Returns the value of the '<em><b>Custom Palette</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Custom Palette</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Custom Palette</em>' attribute.
-	 * @see #setCustomPalette(String)
-	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getPapyrusDiagram_CustomPalette()
-	 * @model
-	 * @generated
-	 */
-	String getCustomPalette();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#getCustomPalette <em>Custom Palette</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Custom Palette</em>' attribute.
-	 * @see #getCustomPalette()
-	 * @generated
-	 */
-	void setCustomPalette(String value);
-
-	/**
 	 * Returns the value of the '<em><b>Custom Style</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -162,4 +137,20 @@ public interface PapyrusDiagram extends PapyrusRepresentationKind {
 	 */
 	void setCreationCommandClass(Class<?> value);
 
+	/**
+	 * Returns the value of the '<em><b>Palettes</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Palettes</em>' reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Palettes</em>' reference list.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getPapyrusDiagram_Palettes()
+	 * @model
+	 * @generated
+	 */
+	EList<PaletteConfiguration> getPalettes();
+
 } // PapyrusDiagram
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/RepresentationPackage.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/RepresentationPackage.java
index 33f59f74fb8..a7e6f9f8595 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/RepresentationPackage.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/RepresentationPackage.java
@@ -43,7 +43,7 @@ public interface RepresentationPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNAME = "representation";
+	String eNAME = "representation"; //$NON-NLS-1$
 
 	/**
 	 * The package namespace URI.
@@ -51,7 +51,7 @@ public interface RepresentationPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNS_URI = "http://www.eclipse.org/papyrus/infra/gmfdiag/representation";
+	String eNS_URI = "http://www.eclipse.org/papyrus/infra/gmfdiag/representation"; //$NON-NLS-1$
 
 	/**
 	 * The package namespace name.
@@ -59,7 +59,7 @@ public interface RepresentationPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNS_PREFIX = "gmfdiagrepresentation";
+	String eNS_PREFIX = "gmfdiagrepresentation"; //$NON-NLS-1$
 
 	/**
 	 * The singleton instance of the package.
@@ -170,58 +170,58 @@ public interface RepresentationPackage extends EPackage {
 	int PAPYRUS_DIAGRAM__IMPLEMENTATION_ID = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__IMPLEMENTATION_ID;
 
 	/**
-	 * The feature id for the '<em><b>Custom Palette</b></em>' attribute.
+	 * The feature id for the '<em><b>Custom Style</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int PAPYRUS_DIAGRAM__CUSTOM_PALETTE = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND_FEATURE_COUNT + 0;
+	int PAPYRUS_DIAGRAM__CUSTOM_STYLE = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Custom Style</b></em>' attribute.
+	 * The feature id for the '<em><b>Child Rules</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int PAPYRUS_DIAGRAM__CUSTOM_STYLE = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND_FEATURE_COUNT + 1;
+	int PAPYRUS_DIAGRAM__CHILD_RULES = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Child Rules</b></em>' containment reference list.
+	 * The feature id for the '<em><b>Palette Rules</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int PAPYRUS_DIAGRAM__CHILD_RULES = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND_FEATURE_COUNT + 2;
+	int PAPYRUS_DIAGRAM__PALETTE_RULES = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Palette Rules</b></em>' containment reference list.
+	 * The feature id for the '<em><b>Assistant Rules</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int PAPYRUS_DIAGRAM__PALETTE_RULES = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND_FEATURE_COUNT + 3;
+	int PAPYRUS_DIAGRAM__ASSISTANT_RULES = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Assistant Rules</b></em>' containment reference list.
+	 * The feature id for the '<em><b>Creation Command Class</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int PAPYRUS_DIAGRAM__ASSISTANT_RULES = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND_FEATURE_COUNT + 4;
+	int PAPYRUS_DIAGRAM__CREATION_COMMAND_CLASS = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Creation Command Class</b></em>' attribute.
+	 * The feature id for the '<em><b>Palettes</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int PAPYRUS_DIAGRAM__CREATION_COMMAND_CLASS = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND_FEATURE_COUNT + 5;
+	int PAPYRUS_DIAGRAM__PALETTES = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND_FEATURE_COUNT + 5;
 
 	/**
 	 * The number of structural features of the '<em>Papyrus Diagram</em>' class.
@@ -492,17 +492,6 @@ public interface RepresentationPackage extends EPackage {
 	EClass getPapyrusDiagram();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#getCustomPalette <em>Custom Palette</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Custom Palette</em>'.
-	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#getCustomPalette()
-	 * @see #getPapyrusDiagram()
-	 * @generated
-	 */
-	EAttribute getPapyrusDiagram_CustomPalette();
-
-	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#getCustomStyle <em>Custom Style</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -558,6 +547,17 @@ public interface RepresentationPackage extends EPackage {
 	EAttribute getPapyrusDiagram_CreationCommandClass();
 
 	/**
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#getPalettes <em>Palettes</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>Palettes</em>'.
+	 * @see org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#getPalettes()
+	 * @see #getPapyrusDiagram()
+	 * @generated
+	 */
+	EReference getPapyrusDiagram_Palettes();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.representation.ChildRule <em>Child Rule</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -751,14 +751,6 @@ public interface RepresentationPackage extends EPackage {
 		EClass PAPYRUS_DIAGRAM = eINSTANCE.getPapyrusDiagram();
 
 		/**
-		 * The meta object literal for the '<em><b>Custom Palette</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PAPYRUS_DIAGRAM__CUSTOM_PALETTE = eINSTANCE.getPapyrusDiagram_CustomPalette();
-
-		/**
 		 * The meta object literal for the '<em><b>Custom Style</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -799,6 +791,14 @@ public interface RepresentationPackage extends EPackage {
 		EAttribute PAPYRUS_DIAGRAM__CREATION_COMMAND_CLASS = eINSTANCE.getPapyrusDiagram_CreationCommandClass();
 
 		/**
+		 * The meta object literal for the '<em><b>Palettes</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PAPYRUS_DIAGRAM__PALETTES = eINSTANCE.getPapyrusDiagram_Palettes();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.representation.impl.ChildRuleImpl <em>Child Rule</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/PapyrusDiagramImpl.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/PapyrusDiagramImpl.java
index 6200d1e8814..c4283222d86 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/PapyrusDiagramImpl.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/PapyrusDiagramImpl.java
@@ -17,19 +17,15 @@ import java.util.Collection;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.papyrus.infra.architecture.representation.impl.PapyrusRepresentationKindImpl;
-
+import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteConfiguration;
 import org.eclipse.papyrus.infra.gmfdiag.representation.AssistantRule;
 import org.eclipse.papyrus.infra.gmfdiag.representation.ChildRule;
 import org.eclipse.papyrus.infra.gmfdiag.representation.PaletteRule;
@@ -37,48 +33,26 @@ import org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram;
 import org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage;
 
 /**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Papyrus Diagram</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Papyrus
+ * Diagram</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.impl.PapyrusDiagramImpl#getCustomPalette <em>Custom Palette</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.impl.PapyrusDiagramImpl#getCustomStyle <em>Custom Style</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.impl.PapyrusDiagramImpl#getChildRules <em>Child Rules</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.impl.PapyrusDiagramImpl#getPaletteRules <em>Palette Rules</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.impl.PapyrusDiagramImpl#getAssistantRules <em>Assistant Rules</em>}</li>
  *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.impl.PapyrusDiagramImpl#getCreationCommandClass <em>Creation Command Class</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.gmfdiag.representation.impl.PapyrusDiagramImpl#getPalettes <em>Palettes</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements PapyrusDiagram {
 	/**
-	 * The default value of the '{@link #getCustomPalette() <em>Custom Palette</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCustomPalette()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CUSTOM_PALETTE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCustomPalette() <em>Custom Palette</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCustomPalette()
-	 * @generated
-	 * @ordered
-	 */
-	protected String customPalette = CUSTOM_PALETTE_EDEFAULT;
-
-	/**
 	 * The default value of the '{@link #getCustomStyle() <em>Custom Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getCustomStyle()
 	 * @generated
 	 * @ordered
@@ -87,8 +61,7 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements
 
 	/**
 	 * The cached value of the '{@link #getCustomStyle() <em>Custom Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getCustomStyle()
 	 * @generated
 	 * @ordered
@@ -97,8 +70,7 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements
 
 	/**
 	 * The cached value of the '{@link #getChildRules() <em>Child Rules</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getChildRules()
 	 * @generated
 	 * @ordered
@@ -107,8 +79,8 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements
 
 	/**
 	 * The cached value of the '{@link #getPaletteRules() <em>Palette Rules</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
 	 * @see #getPaletteRules()
 	 * @generated
 	 * @ordered
@@ -117,8 +89,8 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements
 
 	/**
 	 * The cached value of the '{@link #getAssistantRules() <em>Assistant Rules</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
 	 * @see #getAssistantRules()
 	 * @generated
 	 * @ordered
@@ -126,9 +98,10 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements
 	protected EList<AssistantRule> assistantRules;
 
 	/**
-	 * The cached value of the '{@link #getCreationCommandClass() <em>Creation Command Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getCreationCommandClass() <em>Creation
+	 * Command Class</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @see #getCreationCommandClass()
 	 * @generated
 	 * @ordered
@@ -136,8 +109,16 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements
 	protected Class<?> creationCommandClass;
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The cached value of the '{@link #getPalettes() <em>Palettes</em>}' reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @see #getPalettes()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<PaletteConfiguration> palettes;
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	protected PapyrusDiagramImpl() {
@@ -145,8 +126,7 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
@@ -155,29 +135,7 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCustomPalette() {
-		return customPalette;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCustomPalette(String newCustomPalette) {
-		String oldCustomPalette = customPalette;
-		customPalette = newCustomPalette;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, RepresentationPackage.PAPYRUS_DIAGRAM__CUSTOM_PALETTE, oldCustomPalette, customPalette));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public String getCustomStyle() {
@@ -185,8 +143,7 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public void setCustomStyle(String newCustomStyle) {
@@ -197,8 +154,7 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public EList<ChildRule> getChildRules() {
@@ -209,8 +165,7 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public EList<PaletteRule> getPaletteRules() {
@@ -221,8 +176,7 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public EList<AssistantRule> getAssistantRules() {
@@ -233,8 +187,7 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public Class<?> getCreationCommandClass() {
@@ -242,8 +195,7 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public void setCreationCommandClass(Class<?> newCreationCommandClass) {
@@ -254,8 +206,18 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<PaletteConfiguration> getPalettes() {
+		if (palettes == null) {
+			palettes = new EObjectResolvingEList<PaletteConfiguration>(PaletteConfiguration.class, this, RepresentationPackage.PAPYRUS_DIAGRAM__PALETTES);
+		}
+		return palettes;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
@@ -272,15 +234,12 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case RepresentationPackage.PAPYRUS_DIAGRAM__CUSTOM_PALETTE:
-				return getCustomPalette();
 			case RepresentationPackage.PAPYRUS_DIAGRAM__CUSTOM_STYLE:
 				return getCustomStyle();
 			case RepresentationPackage.PAPYRUS_DIAGRAM__CHILD_RULES:
@@ -291,22 +250,20 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements
 				return getAssistantRules();
 			case RepresentationPackage.PAPYRUS_DIAGRAM__CREATION_COMMAND_CLASS:
 				return getCreationCommandClass();
+			case RepresentationPackage.PAPYRUS_DIAGRAM__PALETTES:
+				return getPalettes();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case RepresentationPackage.PAPYRUS_DIAGRAM__CUSTOM_PALETTE:
-				setCustomPalette((String)newValue);
-				return;
 			case RepresentationPackage.PAPYRUS_DIAGRAM__CUSTOM_STYLE:
 				setCustomStyle((String)newValue);
 				return;
@@ -325,21 +282,21 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements
 			case RepresentationPackage.PAPYRUS_DIAGRAM__CREATION_COMMAND_CLASS:
 				setCreationCommandClass((Class<?>)newValue);
 				return;
+			case RepresentationPackage.PAPYRUS_DIAGRAM__PALETTES:
+				getPalettes().clear();
+				getPalettes().addAll((Collection<? extends PaletteConfiguration>)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case RepresentationPackage.PAPYRUS_DIAGRAM__CUSTOM_PALETTE:
-				setCustomPalette(CUSTOM_PALETTE_EDEFAULT);
-				return;
 			case RepresentationPackage.PAPYRUS_DIAGRAM__CUSTOM_STYLE:
 				setCustomStyle(CUSTOM_STYLE_EDEFAULT);
 				return;
@@ -355,20 +312,20 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements
 			case RepresentationPackage.PAPYRUS_DIAGRAM__CREATION_COMMAND_CLASS:
 				setCreationCommandClass((Class<?>)null);
 				return;
+			case RepresentationPackage.PAPYRUS_DIAGRAM__PALETTES:
+				getPalettes().clear();
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case RepresentationPackage.PAPYRUS_DIAGRAM__CUSTOM_PALETTE:
-				return CUSTOM_PALETTE_EDEFAULT == null ? customPalette != null : !CUSTOM_PALETTE_EDEFAULT.equals(customPalette);
 			case RepresentationPackage.PAPYRUS_DIAGRAM__CUSTOM_STYLE:
 				return CUSTOM_STYLE_EDEFAULT == null ? customStyle != null : !CUSTOM_STYLE_EDEFAULT.equals(customStyle);
 			case RepresentationPackage.PAPYRUS_DIAGRAM__CHILD_RULES:
@@ -379,13 +336,14 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements
 				return assistantRules != null && !assistantRules.isEmpty();
 			case RepresentationPackage.PAPYRUS_DIAGRAM__CREATION_COMMAND_CLASS:
 				return creationCommandClass != null;
+			case RepresentationPackage.PAPYRUS_DIAGRAM__PALETTES:
+				return palettes != null && !palettes.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
@@ -393,9 +351,7 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements
 		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (customPalette: "); //$NON-NLS-1$
-		result.append(customPalette);
-		result.append(", customStyle: "); //$NON-NLS-1$
+		result.append(" (customStyle: "); //$NON-NLS-1$
 		result.append(customStyle);
 		result.append(", creationCommandClass: "); //$NON-NLS-1$
 		result.append(creationCommandClass);
@@ -403,4 +359,4 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements
 		return result.toString();
 	}
 
-} //PapyrusDiagramImpl
+} // PapyrusDiagramImpl
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/RepresentationPackageImpl.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/RepresentationPackageImpl.java
index cc553227d70..77c81213d8a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/RepresentationPackageImpl.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/RepresentationPackageImpl.java
@@ -20,13 +20,18 @@ import org.eclipse.emf.ecore.EGenericType;
 import org.eclipse.emf.ecore.EOperation;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcorePackage;
 
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 
 import org.eclipse.papyrus.infra.constraints.ConstraintsPackage;
+
 import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
+
+import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteconfigurationPackage;
+
 import org.eclipse.papyrus.infra.gmfdiag.representation.AssistantRule;
 import org.eclipse.papyrus.infra.gmfdiag.representation.ChildRule;
 import org.eclipse.papyrus.infra.gmfdiag.representation.PaletteRule;
@@ -34,6 +39,7 @@ import org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram;
 import org.eclipse.papyrus.infra.gmfdiag.representation.PathElement;
 import org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationFactory;
 import org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage;
+
 import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 
 /**
@@ -134,7 +140,9 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 		// Initialize simple dependencies
 		ArchitecturePackage.eINSTANCE.eClass();
 		ConstraintsPackage.eINSTANCE.eClass();
+		EcorePackage.eINSTANCE.eClass();
 		ElementTypesConfigurationsPackage.eINSTANCE.eClass();
+		PaletteconfigurationPackage.eINSTANCE.eClass();
 		org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.eINSTANCE.eClass();
 
 		// Create package meta-data objects
@@ -166,7 +174,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getPapyrusDiagram_CustomPalette() {
+	public EAttribute getPapyrusDiagram_CustomStyle() {
 		return (EAttribute)papyrusDiagramEClass.getEStructuralFeatures().get(0);
 	}
 
@@ -175,8 +183,8 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getPapyrusDiagram_CustomStyle() {
-		return (EAttribute)papyrusDiagramEClass.getEStructuralFeatures().get(1);
+	public EReference getPapyrusDiagram_ChildRules() {
+		return (EReference)papyrusDiagramEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -184,7 +192,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getPapyrusDiagram_ChildRules() {
+	public EReference getPapyrusDiagram_PaletteRules() {
 		return (EReference)papyrusDiagramEClass.getEStructuralFeatures().get(2);
 	}
 
@@ -193,7 +201,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getPapyrusDiagram_PaletteRules() {
+	public EReference getPapyrusDiagram_AssistantRules() {
 		return (EReference)papyrusDiagramEClass.getEStructuralFeatures().get(3);
 	}
 
@@ -202,8 +210,8 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getPapyrusDiagram_AssistantRules() {
-		return (EReference)papyrusDiagramEClass.getEStructuralFeatures().get(4);
+	public EAttribute getPapyrusDiagram_CreationCommandClass() {
+		return (EAttribute)papyrusDiagramEClass.getEStructuralFeatures().get(4);
 	}
 
 	/**
@@ -211,8 +219,8 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getPapyrusDiagram_CreationCommandClass() {
-		return (EAttribute)papyrusDiagramEClass.getEStructuralFeatures().get(5);
+	public EReference getPapyrusDiagram_Palettes() {
+		return (EReference)papyrusDiagramEClass.getEStructuralFeatures().get(5);
 	}
 
 	/**
@@ -379,12 +387,12 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 
 		// Create classes and their features
 		papyrusDiagramEClass = createEClass(PAPYRUS_DIAGRAM);
-		createEAttribute(papyrusDiagramEClass, PAPYRUS_DIAGRAM__CUSTOM_PALETTE);
 		createEAttribute(papyrusDiagramEClass, PAPYRUS_DIAGRAM__CUSTOM_STYLE);
 		createEReference(papyrusDiagramEClass, PAPYRUS_DIAGRAM__CHILD_RULES);
 		createEReference(papyrusDiagramEClass, PAPYRUS_DIAGRAM__PALETTE_RULES);
 		createEReference(papyrusDiagramEClass, PAPYRUS_DIAGRAM__ASSISTANT_RULES);
 		createEAttribute(papyrusDiagramEClass, PAPYRUS_DIAGRAM__CREATION_COMMAND_CLASS);
+		createEReference(papyrusDiagramEClass, PAPYRUS_DIAGRAM__PALETTES);
 
 		childRuleEClass = createEClass(CHILD_RULE);
 		createEReference(childRuleEClass, CHILD_RULE__ELEMENT);
@@ -433,6 +441,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 
 		// Obtain other dependent packages
 		org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage theRepresentationPackage_1 = (org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage)EPackage.Registry.INSTANCE.getEPackage(org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.eNS_URI);
+		PaletteconfigurationPackage thePaletteconfigurationPackage = (PaletteconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(PaletteconfigurationPackage.eNS_URI);
 
 		// Create type parameters
 
@@ -446,7 +455,6 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 
 		// Initialize classes, features, and operations; add parameters
 		initEClass(papyrusDiagramEClass, PapyrusDiagram.class, "PapyrusDiagram", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getPapyrusDiagram_CustomPalette(), ecorePackage.getEString(), "customPalette", null, 0, 1, PapyrusDiagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 		initEAttribute(getPapyrusDiagram_CustomStyle(), ecorePackage.getEString(), "customStyle", null, 0, 1, PapyrusDiagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 		initEReference(getPapyrusDiagram_ChildRules(), this.getChildRule(), null, "childRules", null, 0, -1, PapyrusDiagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 		initEReference(getPapyrusDiagram_PaletteRules(), this.getPaletteRule(), null, "paletteRules", null, 0, -1, PapyrusDiagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
@@ -455,6 +463,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
 		EGenericType g2 = createEGenericType();
 		g1.getETypeArguments().add(g2);
 		initEAttribute(getPapyrusDiagram_CreationCommandClass(), g1, "creationCommandClass", null, 1, 1, PapyrusDiagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getPapyrusDiagram_Palettes(), thePaletteconfigurationPackage.getPaletteConfiguration(), null, "palettes", null, 0, -1, PapyrusDiagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
 		initEClass(childRuleEClass, ChildRule.class, "ChildRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 		initEReference(getChildRule_Element(), ecorePackage.getEClass(), null, "element", null, 0, 1, ChildRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/util/RepresentationAdapterFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/util/RepresentationAdapterFactory.java
index 280bef9953f..c73a01c3e97 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/util/RepresentationAdapterFactory.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/util/RepresentationAdapterFactory.java
@@ -20,12 +20,12 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 
 import org.eclipse.emf.ecore.EObject;
 
-import org.eclipse.papyrus.infra.core.architecture.ADElement;
-import org.eclipse.papyrus.infra.core.architecture.RepresentationKind;
-
 import org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind;
 import org.eclipse.papyrus.infra.architecture.representation.Rule;
 
+import org.eclipse.papyrus.infra.core.architecture.ADElement;
+import org.eclipse.papyrus.infra.core.architecture.RepresentationKind;
+
 import org.eclipse.papyrus.infra.gmfdiag.representation.*;
 
 /**
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/plugin.xml b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/plugin.xml
index fbb0f54f475..a10bc97abf1 100644
--- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/plugin.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/plugin.xml
@@ -72,7 +72,7 @@
    <extension

          point="org.eclipse.papyrus.infra.gmfdiag.common.paletteCustomization">

       <customizer

-            customizerDialog="org.eclipse.papyrus.customization.palette.dialog.PapyrusPaletteCustomizerDialog">

+            customizerDialog="org.eclipse.papyrus.toolsmiths.palette.dialog.PapyrusPaletteCustomizerDialog">

       </customizer>

    </extension>

 </plugin>

diff --git a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/src/org/eclipse/papyrus/toolsmiths/palette/Messages.java b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/src/org/eclipse/papyrus/toolsmiths/palette/Messages.java
index 5e2bf596e15..bfca20bf86a 100644
--- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/src/org/eclipse/papyrus/toolsmiths/palette/Messages.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/src/org/eclipse/papyrus/toolsmiths/palette/Messages.java
@@ -18,7 +18,7 @@ import org.eclipse.osgi.util.NLS;
  */
 public class Messages extends NLS {
 
-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.customization.palette.messages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.toolsmiths.palette.messages"; //$NON-NLS-1$
 
 	static {
 		// initialize resource bundle
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/src/org/eclipse/papyrus/toolsmiths/palette/dialog/PapyrusPaletteCustomizerDialog.java b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/src/org/eclipse/papyrus/toolsmiths/palette/dialog/PapyrusPaletteCustomizerDialog.java
index dfbfd31bcdc..b69b7243c84 100644
--- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/src/org/eclipse/papyrus/toolsmiths/palette/dialog/PapyrusPaletteCustomizerDialog.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/src/org/eclipse/papyrus/toolsmiths/palette/dialog/PapyrusPaletteCustomizerDialog.java
@@ -41,7 +41,6 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.wizard.WizardDialog;
@@ -224,40 +223,33 @@ public class PapyrusPaletteCustomizerDialog extends PaletteCustomizerDialogEx im
 	 * @return the listener
 	 */
 	protected ISelectionChangedListener createSelectionChangedListener() {
-		return new ISelectionChangedListener() {
+		return event -> {
+			// retrieve element selected
+			Object selectedElement = ((IStructuredSelection) event.getSelection()).getFirstElement();
 
-			/**
-			 * {@inheritDoc}
-			 */
-			@Override
-			public void selectionChanged(final SelectionChangedEvent event) {
-				// retrieve element selected
-				Object selectedElement = ((IStructuredSelection) event.getSelection()).getFirstElement();
-
-				// Plug-in contribution palette
-				if (selectedElement instanceof PapyrusPaletteService.ExtendedProviderDescriptor) {
-					IProvider provider = ((PapyrusPaletteService.ExtendedProviderDescriptor) selectedElement).getProvider();
-
-					// Modelconfiguration model definition
-					if (provider instanceof ExtendedPluginPaletteProvider) {
-						paletteButtonsMap.get(DELETE_PALETTE_BUTTON_ID).setEnabled(false);
-						paletteButtonsMap.get(EDIT_PALETTE_BUTTON_ID).setEnabled(true);
-						paletteButtonsMap.get(RESTORE_DEFAULT_PALETTE_BUTTON_ID).setEnabled(isRedefined((ExtendedProviderDescriptor) selectedElement));
-						paletteButtonsMap.get(EXPORT_DEFAULT_PALETTE_BUTTON_ID).setEnabled(true);
-					}
-				} else
-				// Local Palette configuration model
-				if (selectedElement instanceof PapyrusPaletteService.LocalExtendedProviderDescriptor) {
-					paletteButtonsMap.get(DELETE_PALETTE_BUTTON_ID).setEnabled(true);
+			// Plug-in contribution palette
+			if (selectedElement instanceof PapyrusPaletteService.ExtendedProviderDescriptor) {
+				IProvider provider = ((PapyrusPaletteService.ExtendedProviderDescriptor) selectedElement).getProvider();
+
+				// Modelconfiguration model definition
+				if (provider instanceof ExtendedPluginPaletteProvider) {
+					paletteButtonsMap.get(DELETE_PALETTE_BUTTON_ID).setEnabled(false);
 					paletteButtonsMap.get(EDIT_PALETTE_BUTTON_ID).setEnabled(true);
-					paletteButtonsMap.get(RESTORE_DEFAULT_PALETTE_BUTTON_ID).setEnabled(false);
+					paletteButtonsMap.get(RESTORE_DEFAULT_PALETTE_BUTTON_ID).setEnabled(isRedefined((ProviderDescriptor) selectedElement));
 					paletteButtonsMap.get(EXPORT_DEFAULT_PALETTE_BUTTON_ID).setEnabled(true);
-				} else {
-					paletteButtonsMap.get(DELETE_PALETTE_BUTTON_ID).setEnabled(false);
-					paletteButtonsMap.get(EDIT_PALETTE_BUTTON_ID).setEnabled(false);
-					paletteButtonsMap.get(RESTORE_DEFAULT_PALETTE_BUTTON_ID).setEnabled(false);
-					paletteButtonsMap.get(EXPORT_DEFAULT_PALETTE_BUTTON_ID).setEnabled(false);
 				}
+			} else
+			// Local Palette configuration model
+			if (selectedElement instanceof PapyrusPaletteService.LocalExtendedProviderDescriptor) {
+				paletteButtonsMap.get(DELETE_PALETTE_BUTTON_ID).setEnabled(true);
+				paletteButtonsMap.get(EDIT_PALETTE_BUTTON_ID).setEnabled(true);
+				paletteButtonsMap.get(RESTORE_DEFAULT_PALETTE_BUTTON_ID).setEnabled(false);
+				paletteButtonsMap.get(EXPORT_DEFAULT_PALETTE_BUTTON_ID).setEnabled(true);
+			} else {
+				paletteButtonsMap.get(DELETE_PALETTE_BUTTON_ID).setEnabled(false);
+				paletteButtonsMap.get(EDIT_PALETTE_BUTTON_ID).setEnabled(false);
+				paletteButtonsMap.get(RESTORE_DEFAULT_PALETTE_BUTTON_ID).setEnabled(false);
+				paletteButtonsMap.get(EXPORT_DEFAULT_PALETTE_BUTTON_ID).setEnabled(false);
 			}
 		};
 	}
@@ -569,10 +561,11 @@ public class PapyrusPaletteCustomizerDialog extends PaletteCustomizerDialogEx im
 	 */
 	protected void editSelectedPalette(IStructuredSelection selection) {
 		if (null != selection) {
-			if (selection.getFirstElement() instanceof PapyrusPaletteService.WorkspaceExtendedProviderDescriptor || selection.getFirstElement() instanceof PapyrusPaletteService.LocalExtendedProviderDescriptor) {
-				editPaletteConfiguration((ProviderDescriptor) selection.getFirstElement());
-			} else if (selection.getFirstElement() instanceof PapyrusPaletteService.ExtendedProviderDescriptor) {
-				editExtendedPalette((PapyrusPaletteService.ExtendedProviderDescriptor) selection.getFirstElement());
+			Object descriptor = selection.getFirstElement();
+			if (descriptor instanceof PapyrusPaletteService.WorkspaceExtendedProviderDescriptor || descriptor instanceof PapyrusPaletteService.LocalExtendedProviderDescriptor) {
+				editPaletteConfiguration((ProviderDescriptor) descriptor);
+			} else if (descriptor instanceof PapyrusPaletteService.ExtendedProviderDescriptor) {
+				editExtendedPalette((PapyrusPaletteService.ExtendedProviderDescriptor) descriptor);
 			}
 		}
 	}
@@ -627,7 +620,7 @@ public class PapyrusPaletteCustomizerDialog extends PaletteCustomizerDialogEx im
 	 *            the exttended provider desciptor to test
 	 * @return true if redefined
 	 */
-	public Boolean isRedefined(final ExtendedProviderDescriptor descriptor) {
+	public Boolean isRedefined(final ProviderDescriptor descriptor) {
 		// check the file in plugin state area.
 		String contributionID = descriptor.getContributionID();
 		String paletteRedefinition = PapyrusPalettePreferences.getPaletteRedefinition(contributionID);
diff --git a/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/model/uml.architecture b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/model/uml.architecture
index e358c6ffb63..efffdf767fd 100644
--- a/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/model/uml.architecture
+++ b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/model/uml.architecture
@@ -1,434 +1,445 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<architecture:ArchitectureDomain xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:gmfdiagrepresentation="http://www.eclipse.org/papyrus/infra/gmfdiag/representation" xmlns:nattablerepresentation="http://www.eclipse.org/papyrus/infra/nattable/representation" xmi:id="_HQhf4MSYEeaKZJ_pGfaSiA" name="Software Engineering" description="The domain of developing software systems">
-  <stakeholders xmi:id="_HQhf4cSYEeaKZJ_pGfaSiA" name="Software Engineer" description="An engineer interested in software development" concerns="_HQhf4sSYEeaKZJ_pGfaSiA _HQhf48SYEeaKZJ_pGfaSiA _HQhf5MSYEeaKZJ_pGfaSiA"/>
-  <stakeholders xmi:id="_IigrMMSjEeaCPPhpB0_9OQ" name="Domain Architect" concerns="_NxfRgMSjEeaCPPhpB0_9OQ"/>
-  <concerns xmi:id="_NxfRgMSjEeaCPPhpB0_9OQ" name="Profiles" description="The concern of defining the domain profiles"/>
-  <concerns xmi:id="_HQhf4sSYEeaKZJ_pGfaSiA" name="Use Cases" description="The concern of defining the system's use cases"/>
-  <concerns xmi:id="_HQhf48SYEeaKZJ_pGfaSiA" name="Structure" description="The concern of developing the system's structure"/>
-  <concerns xmi:id="_HQhf5MSYEeaKZJ_pGfaSiA" name="Behavior" description="The concern of developing the system's behavior"/>
-  <contexts xsi:type="architecture:ArchitectureDescriptionLanguage" xmi:id="_HQhf5cSYEeaKZJ_pGfaSiA" name="UML" description="The Unified Modeling Language" id="org.eclipse.papyrus.infra.services.edit.TypeContext" icon="platform:/plugin/org.eclipse.papyrus.uml.architecture/icons/uml.gif" creationCommandClass="org.eclipse.papyrus.uml.diagram.common.commands.CreateUMLModelCommand">
-    <viewpoints xmi:id="_HQhf5sSYEeaKZJ_pGfaSiA" name="Software Analysis" description="A viewpoint allowing software analysis with UML" representationKinds="_yeY0sHDvEeWh-MssWmCB_A _zzf4gHDtEeWh-MssWmCB_A _zzf4cXDtEeWh-MssWmCB_A _P3J1cEb7EeRVGbM3cmVSqQ _Uz8agHDcEeWh-MssWmCB_A _P3J1cEa7EeSVGbM3cmVSqQ _WC1q0P4UEhSRsNBVzfUrzA _wXztQHDwEwWh-MssWmCB_A" id="org.eclipse.papyrus.uml.analysis"/>
-    <viewpoints xmi:id="_OOrIUMSZEeaKZJ_pGfaSiA" name="Software Design" description="A viewpoint allowing software design with UML" representationKinds="_UzcgsHDtEeWh-MssWmCB_A _zzf4gHDtEeWh-MssWmCB_A _jRtroHDuEeWh-MssWmCB_A _fa4kAHDuEeWh-MssWmCB_A _fa4kBHDuEeWh-MssWmCB_A _bKiwMHDuEeWh-MssWmCB_A _bKiwNHDuEeWh-MssWmCB_A _ARGokHDuEeWh-MssWmCB_A _zzf4YHDtEeWh-MssWmCB_A _FuMjYHDuEeWh-MssWmCB_A _zzf4cXDtEeWh-MssWmCB_A _TR15IHDvEeWh-MssWmCB_A _PwD0cHDvEeWh-MssWmCB_A _LzyMIHDvEeWh-MssWmCB_A _P3J1cEb7EeRVGbM3cmVSqQ _Uz8agHDcEeWh-MssWmCB_A _P3J1cEa7EeSVGbM3cmVSqQ _WC1q0P4UEhSRsNBVzfUrzA _wXztQHDwEwWh-MssWmCB_A" id="org.eclipse.papyrus.uml.design"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.emf/model/infra-emf.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.common/model/notation.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.common/model/gmfdiag-common.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontents.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontext.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.nattable.common/model/nattable-common.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.services.controlmode/model/controlmode.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.services.edit/model/marker.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.types.rulebased/model/rulebased.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.elementtypesconfigurations#_x8G0YGaNEeSyJIsxLao1Pw"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.communication/model/communicationdiagram.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.elementtypesconfigurations#_tL86sLazEeSbnofizoRSMQ"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.interactionoverview/model/interactionOverviewDiagram.elementtypesconfigurations#_x8G0YGaNEeSyJIsxLao1Pw"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.sequence/model/sequencediagram-uml.elementtypesconfigurations#_BJMa0PyeEeWbo9Y7g2MLdw"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram.elementtypesconfigurations#_wYwtMMeDEeSwP_9Vn5UnWg"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.stereotype.edition/model/stereotype-edit.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.timing/model/timingdiagram-uml.elementtypesconfigurations#_BJMa0PyeEeWbo9Y7g2MLdw"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/StandardProfile.elementtypesconfigurations#_jfoLkGT_EeSEqNuV3JpFCA"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types.ui/model/uml-advice.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_UzcgsHDtEeWh-MssWmCB_A" name="Activity Diagram" concerns="_HQhf5MSYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.activity/icons/obj16/Diagram_Activity.gif" implementationID="PapyrusUMLActivityDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.activity.CreateActivityDiagramCommand">
-      <modelRules xmi:id="_UzcgsXDtEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity"/>
-      </modelRules>
-      <owningRules xmi:id="_UzcgsnDtEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity"/>
-      </owningRules>
-      <owningRules xmi:id="_Uzcgs3DtEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
-        <newModelPath xmi:id="_UzcgtHDtEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Activity">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
-        </newModelPath>
-      </owningRules>
-      <owningRules xmi:id="_UzcgtXDtEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
-        <newModelPath xmi:id="_UzcgtnDtEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Activity">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
-        </newModelPath>
-      </owningRules>
-      <owningRules xmi:id="_Uzcgt3DtEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        <newModelPath xmi:id="_UzcguHDtEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Activity">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
-        </newModelPath>
-      </owningRules>
-      <childRules xmi:id="_UzcguXDtEeWh-MssWmCB_A"/>
-    </representationKinds>
-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_zzf4gHDtEeWh-MssWmCB_A" name="Class Diagram" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/icons/obj16/Diagram_Class.gif" implementationID="PapyrusUMLClassDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand">
-      <modelRules xmi:id="_zzf4gXDtEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </modelRules>
-      <owningRules xmi:id="_zzf4gnDtEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </owningRules>
-      <childRules xmi:id="_zzf4g3DtEeWh-MssWmCB_A"/>
-    </representationKinds>
-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_zzf4YHDtEeWh-MssWmCB_A" name="Inner Class Diagram" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/icons/obj16/Diagram_Class.gif" implementationID="PapyrusUMLClassDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand">
-      <modelRules xmi:id="_zzf4YXDtEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-      </modelRules>
-      <owningRules xmi:id="_zzf4YnDtEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-      </owningRules>
-      <owningRules xmi:id="_zzf4Y3DtEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </owningRules>
-      <childRules xmi:id="_zzf4ZHDtEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        <origin href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-        <insertionPath xmi:id="_zzf4ZXDtEeWh-MssWmCB_A">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
-        </insertionPath>
-      </childRules>
-      <childRules xmi:id="_zzf4ZnDtEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Comment"/>
-        <origin href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-        <insertionPath xmi:id="_zzf4Z3DtEeWh-MssWmCB_A">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedComment"/>
-        </insertionPath>
-      </childRules>
-      <paletteRules xmi:id="_zzf4aHDtEeWh-MssWmCB_A" element="clazz.tool.class"/>
-      <paletteRules xmi:id="_zzf4aXDtEeWh-MssWmCB_A" element="clazz.tool.comment"/>
-      <paletteRules xmi:id="_zzf4anDtEeWh-MssWmCB_A" element="clazz.tool.interface"/>
-      <paletteRules xmi:id="_zzf4a3DtEeWh-MssWmCB_A" element="clazz.tool.abstraction"/>
-      <paletteRules xmi:id="_zzf4bHDtEeWh-MssWmCB_A" element="clazz.tool.association"/>
-      <paletteRules xmi:id="_zzf4bXDtEeWh-MssWmCB_A" element="clazz.tool.generalization"/>
-      <paletteRules xmi:id="_zzf4bnDtEeWh-MssWmCB_A" element="clazz.tool.generalizationset"/>
-      <paletteRules xmi:id="_zzf4b3DtEeWh-MssWmCB_A" permit="false" element="clazz.tool.*"/>
-      <paletteRules xmi:id="_zzf4cHDtEeWh-MssWmCB_A" element=""/>
-    </representationKinds>
-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_zzf4cXDtEeWh-MssWmCB_A" name="Package Diagram" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/icons/Diagram_Package.gif" implementationID="PapyrusUMLClassDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand">
-      <modelRules xmi:id="_zzf4cnDtEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </modelRules>
-      <owningRules xmi:id="_zzf4c3DtEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </owningRules>
-      <childRules xmi:id="_zzf4dHDtEeWh-MssWmCB_A"/>
-      <paletteRules xmi:id="_zzf4dXDtEeWh-MssWmCB_A" element="clazz.tool.comment"/>
-      <paletteRules xmi:id="_zzf4dnDtEeWh-MssWmCB_A" element="clazz.tool.constraint"/>
-      <paletteRules xmi:id="_zzf4d3DtEeWh-MssWmCB_A" element="clazz.tool.model"/>
-      <paletteRules xmi:id="_zzf4eHDtEeWh-MssWmCB_A" element="clazz.tool.package"/>
-      <paletteRules xmi:id="_zzf4eXDtEeWh-MssWmCB_A" element="clazz.tool.abstraction"/>
-      <paletteRules xmi:id="_zzf4enDtEeWh-MssWmCB_A" element="clazz.tool.dependency"/>
-      <paletteRules xmi:id="_zzf4e3DtEeWh-MssWmCB_A" element="clazz.tool.packageimport"/>
-      <paletteRules xmi:id="_zzf4fHDtEeWh-MssWmCB_A" element="clazz.tool.link"/>
-      <paletteRules xmi:id="_zzf4fXDtEeWh-MssWmCB_A" element="clazz.tool.containmentlink"/>
-      <paletteRules xmi:id="_zzf4fnDtEeWh-MssWmCB_A" permit="false" element="clazz.tool.*"/>
-      <paletteRules xmi:id="_zzf4f3DtEeWh-MssWmCB_A" element=""/>
-    </representationKinds>
-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_jRtroHDuEeWh-MssWmCB_A" name="Communication Diagram" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.communication/icons/obj16/Diagram_Communication.gif" implementationID="PapyrusUMLCommunicationDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.communication.CreateCommunicationDiagramCommand">
-      <modelRules xmi:id="_jRtroXDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Interaction"/>
-      </modelRules>
-      <owningRules xmi:id="_jRtronDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Interaction"/>
-      </owningRules>
-      <owningRules xmi:id="_jRtro3DuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
-        <newModelPath xmi:id="_jRtrpHDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
-        </newModelPath>
-      </owningRules>
-      <owningRules xmi:id="_jRtrpXDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
-        <newModelPath xmi:id="_jRtrpnDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
-        </newModelPath>
-      </owningRules>
-      <owningRules xmi:id="_jRtrp3DuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        <newModelPath xmi:id="_jRtrqHDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
-        </newModelPath>
-      </owningRules>
-      <childRules xmi:id="_jRtrqXDuEeWh-MssWmCB_A"/>
-    </representationKinds>
-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_fa4kAHDuEeWh-MssWmCB_A" name="Component Diagram" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.component/icons/obj16/ComponentDiagram.gif" implementationID="PapyrusUMLComponentDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand">
-      <modelRules xmi:id="_fa4kAXDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </modelRules>
-      <owningRules xmi:id="_fa4kAnDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </owningRules>
-      <childRules xmi:id="_fa4kA3DuEeWh-MssWmCB_A"/>
-    </representationKinds>
-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_fa4kBHDuEeWh-MssWmCB_A" name="Component Diagram" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.component/icons/obj16/ComponentDiagram.gif" implementationID="PapyrusUMLComponentDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand">
-      <modelRules xmi:id="_fa4kBXDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>
-      </modelRules>
-      <owningRules xmi:id="_fa4kBnDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>
-      </owningRules>
-      <owningRules xmi:id="_fa4kB3DuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </owningRules>
-      <childRules xmi:id="_fa4kCHDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        <origin href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>
-        <insertionPath xmi:id="_fa4kCXDuEeWh-MssWmCB_A">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
-        </insertionPath>
-      </childRules>
-      <childRules xmi:id="_fa4kCnDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Comment"/>
-        <origin href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>
-        <insertionPath xmi:id="_fa4kC3DuEeWh-MssWmCB_A">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedComment"/>
-        </insertionPath>
-      </childRules>
-      <childRules xmi:id="_fa4kDHDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Constraint"/>
-        <origin href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>
-        <insertionPath xmi:id="_fa4kDXDuEeWh-MssWmCB_A">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedRule"/>
-        </insertionPath>
-      </childRules>
-      <childRules xmi:id="_fa4kDnDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>
-        <origin href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>
-        <insertionPath xmi:id="_fa4kD3DuEeWh-MssWmCB_A">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//EncapsulatedClassifier/ownedPort"/>
-        </insertionPath>
-      </childRules>
-      <paletteRules xmi:id="_fa4kEHDuEeWh-MssWmCB_A" permit="false" element="component.tool.model"/>
-      <paletteRules xmi:id="_fa4kEXDuEeWh-MssWmCB_A" permit="false" element="component.tool.package"/>
-    </representationKinds>
-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_bKiwMHDuEeWh-MssWmCB_A" name="Composite Structure Diagram" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.composite/icons/obj16/Diagram_CompositeStructure.gif" implementationID="CompositeStructure" creationCommandClass="org.eclipse.papyrus.uml.diagram.composite.CreateCompositeDiagramCommand">
-      <modelRules xmi:id="_bKiwMXDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </modelRules>
-      <owningRules xmi:id="_bKiwMnDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </owningRules>
-      <childRules xmi:id="_bKiwM3DuEeWh-MssWmCB_A"/>
-    </representationKinds>
-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_bKiwNHDuEeWh-MssWmCB_A" name="Composite Structure Diagram" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.composite/icons/obj16/Diagram_CompositeStructure.gif" implementationID="CompositeStructure" creationCommandClass="org.eclipse.papyrus.uml.diagram.composite.CreateCompositeDiagramCommand">
-      <modelRules xmi:id="_bKiwNXDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier"/>
-      </modelRules>
-      <owningRules xmi:id="_bKiwNnDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier"/>
-      </owningRules>
-      <owningRules xmi:id="_bKiwN3DuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </owningRules>
-      <childRules xmi:id="_bKiwOHDuEeWh-MssWmCB_A"/>
-    </representationKinds>
-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_ARGokHDuEeWh-MssWmCB_A" name="Deployment Diagram" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.deployment/icons/obj16/DeploymentDiagram.gif" implementationID="PapyrusUMLDeploymentDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.deployment.CreateDeploymentDiagramCommand">
-      <modelRules xmi:id="_ARGokXDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </modelRules>
-      <owningRules xmi:id="_ARGoknDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </owningRules>
-      <childRules xmi:id="_ARGok3DuEeWh-MssWmCB_A"/>
-    </representationKinds>
-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_FuMjYHDuEeWh-MssWmCB_A" name="Interaction Overview Diagram" concerns="_HQhf5MSYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.interactionoverview/icons/obj16/interactionOverviewDiagram.gif" implementationID="PapyrusUMLInteractionOverviewDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.interactionoverview.InteractionOverviewDiagramCreateCommand">
-      <modelRules xmi:id="_FuMjYXDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity"/>
-      </modelRules>
-      <owningRules xmi:id="_FuMjYnDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity"/>
-      </owningRules>
-      <owningRules xmi:id="_FuMjY3DuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
-        <newModelPath xmi:id="_FuMjZHDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Activity">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
-        </newModelPath>
-      </owningRules>
-      <owningRules xmi:id="_FuMjZXDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
-        <newModelPath xmi:id="_FuMjZnDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Activity">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
-        </newModelPath>
-      </owningRules>
-      <owningRules xmi:id="_FuMjZ3DuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        <newModelPath xmi:id="_FuMjaHDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Activity">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
-        </newModelPath>
-      </owningRules>
-      <childRules xmi:id="_FuMjaXDuEeWh-MssWmCB_A"/>
-    </representationKinds>
-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_UekVgHDwEeWh-MssWmCB_A" name="Profile Diagram" concerns="_NxfRgMSjEeaCPPhpB0_9OQ" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.profile/icons/obj16/Diagram_Profile.gif" implementationID="PapyrusUMLProfileDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.profile.CreateProfileDiagramCommand">
-      <modelRules xmi:id="_UekVgXDwEeWh-MssWmCB_A">
-        <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_UekVgnDwEeWh-MssWmCB_A" name="IsContainedByProfile">
-          <constraintType href="platform:/plugin/org.eclipse.papyrus.infra.constraints/Model/ConstraintEnvironment.xmi#//@constraintTypes.4"/>
-          <properties xsi:type="constraints:ValueProperty" xmi:id="_UekVg3DwEeWh-MssWmCB_A" name="className" value="org.eclipse.papyrus.infra.viewpoints.policy.query.IsContainedByProfileQuery"/>
-        </constraints>
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </modelRules>
-      <owningRules xmi:id="_UekVhHDwEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </owningRules>
-      <owningRules xmi:id="_UekVhXDwEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Profile"/>
-      </owningRules>
-      <childRules xmi:id="_UekVhnDwEeWh-MssWmCB_A"/>
-    </representationKinds>
-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_TR15IHDvEeWh-MssWmCB_A" name="Sequence Diagram" concerns="_HQhf5MSYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.sequence/icons/obj16/Diagram_Sequence.gif" implementationID="PapyrusUMLSequenceDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.sequence.CreateSequenceDiagramCommand">
-      <modelRules xmi:id="_TR15IXDvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Interaction"/>
-      </modelRules>
-      <owningRules xmi:id="_TR15InDvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Interaction"/>
-      </owningRules>
-      <owningRules xmi:id="_TR15I3DvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
-        <newModelPath xmi:id="_TR15JHDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
-        </newModelPath>
-      </owningRules>
-      <owningRules xmi:id="_TR15JXDvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
-        <newModelPath xmi:id="_TR15JnDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
-        </newModelPath>
-      </owningRules>
-      <owningRules xmi:id="_TR15J3DvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        <newModelPath xmi:id="_TR15KHDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
-        </newModelPath>
-      </owningRules>
-      <owningRules xmi:id="_TR15KXDvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//UseCase"/>
-        <newModelPath xmi:id="_TR15KnDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
-        </newModelPath>
-      </owningRules>
-      <childRules xmi:id="_TR15K3DvEeWh-MssWmCB_A"/>
-    </representationKinds>
-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_PwD0cHDvEeWh-MssWmCB_A" name="State Machine Diagram" concerns="_HQhf5MSYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.statemachine/icons/obj16/Diagram_StateMachine.gif" implementationID="PapyrusUMLStateMachineDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.statemachine.CreateStateMachineDiagramCommand">
-      <modelRules xmi:id="_PwD0cXDvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//StateMachine"/>
-      </modelRules>
-      <modelRules xmi:id="_H-oCgB0UEea_bcpknMJ7-w">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//State"/>
-      </modelRules>
-      <owningRules xmi:id="_PwD0cnDvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//StateMachine"/>
-      </owningRules>
-      <owningRules xmi:id="_PwD0c3DvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
-        <newModelPath xmi:id="_PwD0dHDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.StateMachine">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
-        </newModelPath>
-      </owningRules>
-      <owningRules xmi:id="_PwD0dXDvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
-        <newModelPath xmi:id="_PwD0dnDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.StateMachine">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
-        </newModelPath>
-      </owningRules>
-      <owningRules xmi:id="_PwD0d3DvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        <newModelPath xmi:id="_PwD0eHDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.StateMachine">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
-        </newModelPath>
-      </owningRules>
-      <owningRules xmi:id="_PwD0eXDvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>
-        <newModelPath xmi:id="_PwD0enDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.ProtocolStateMachine">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface/protocol"/>
-        </newModelPath>
-      </owningRules>
-      <owningRules xmi:id="_5kmMcB0UEea_bcpknMJ7-w">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//State"/>
-      </owningRules>
-      <childRules xmi:id="_PwD0e3DvEeWh-MssWmCB_A"/>
-    </representationKinds>
-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_LzyMIHDvEeWh-MssWmCB_A" name="Timing Diagram" concerns="_HQhf5MSYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.timing/icons/obj16/Diagram_Timing.gif" implementationID="PapyrusUMLTimingDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.timing.custom.CreateTimingDiagramCommand">
-      <modelRules xmi:id="_LzyMIXDvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </modelRules>
-      <owningRules xmi:id="_LzyMInDvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </owningRules>
-      <childRules xmi:id="_LzyMI3DvEeWh-MssWmCB_A"/>
-    </representationKinds>
-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_yeY0sHDvEeWh-MssWmCB_A" name="Use Case Diagram" concerns="_HQhf4sSYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.usecase/icons/obj16/Diagram_UseCase.gif" implementationID="UseCase" customStyle="platform:/plugin/org.eclipse.papyrus.uml.diagram.usecase/models/usecase.css" creationCommandClass="org.eclipse.papyrus.uml.diagram.usecase.CreateUseCaseDiagramCommand">
-      <modelRules xmi:id="_yeY0sXDvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </modelRules>
-      <modelRules xmi:id="_yeY0snDvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-      </modelRules>
-      <owningRules xmi:id="_yeY0s3DvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </owningRules>
-      <owningRules xmi:id="_yeY0tHDvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-      </owningRules>
-      <childRules xmi:id="_yeY0tXDvEeWh-MssWmCB_A"/>
-    </representationKinds>
-    <representationKinds xsi:type="nattablerepresentation:PapyrusTable" xmi:id="_P3J1cEa7EeSVGbM3cmVSqQ" name="Generic Tree Table" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.nattable/icons/uml_generic_table.png" implementationID="PapyrusUMLGenericTreeTable">
-      <modelRules xmi:id="_vZwgkEr7EeSVGbM3cmVSqQ">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </modelRules>
-      <owningRules xmi:id="_vZwgkUr7EeSVGbM3cmVSqQ">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </owningRules>
-      <configuration href="platform:/plugin/org.eclipse.papyrus.uml.nattable/configs/genericTreeTable.nattableconfiguration#/"/>
-    </representationKinds>
-    <representationKinds xsi:type="nattablerepresentation:PapyrusTable" xmi:id="_P3J1cEb7EeRVGbM3cmVSqQ" name="Class Tree Table" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table.png" implementationID="PapyrusClassTreeTable">
-      <modelRules xmi:id="_vZwgkEr7EeSVGbM3cmVSqQ">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </modelRules>
-      <owningRules xmi:id="_vZwgkUr7EeSVGbM3cmVSqQ">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </owningRules>
-      <configuration href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
-    </representationKinds>
-    <representationKinds xsi:type="nattablerepresentation:PapyrusTable" xmi:id="_Uz8agHDcEeWh-MssWmCB_A" name="Generic Table" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table.png" implementationID="PapyrusGenericTable">
-      <modelRules xmi:id="_Uz8agXDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </modelRules>
-      <owningRules xmi:id="_Uz8agnDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </owningRules>
-      <configuration href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#/"/>
-    </representationKinds>
-    <representationKinds xsi:type="nattablerepresentation:PapyrusTable" xmi:id="_WC1q0P4UEhSRsNBVzfUrzA" name="Stereotype Display Tree Table" concerns="_NxfRgMSjEeaCPPhpB0_9OQ" icon="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table.png" implementationID="PapyrusStereotypeDisplayTreeTable">
-      <modelRules xmi:id="_7k79wP4VEeSRsNBVzfUrzA">
-        <element href="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//View"/>
-      </modelRules>
-      <owningRules xmi:id="_AJmbwP4WEeSRsNBVzfUrzA">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-      </owningRules>
-      <configuration href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotype.display/config/stereotype.nattableconfiguration#/"/>
-    </representationKinds>
-    <representationKinds xsi:type="nattablerepresentation:PapyrusTable" xmi:id="_wXztQHDwEwWh-MssWmCB_A" name="View Table" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/icons/nattablepageeditor.png" implementationID="PapyrusViewsTable">
-      <modelRules xmi:id="_wXztQXDwEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </modelRules>
-      <owningRules xmi:id="_wXztQnDwEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-      </owningRules>
-      <configuration href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#/"/>
-    </representationKinds>
-    <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
-  </contexts>
-  <contexts xsi:type="architecture:ArchitectureFramework" xmi:id="__ZqwAMSlEeaCPPhpB0_9OQ" name="Profile" description="The Profile Definition Framework" id="org.eclipse.papyrus.uml.architecture.Profile" icon="platform:/plugin/org.eclipse.papyrus.uml.architecture/icons/profile.gif" extensionPrefix="profile" creationCommandClass="org.eclipse.papyrus.uml.diagram.profile.CreateProfileModelCommand">
-    <viewpoints xmi:id="_hoXx0MSiEeaKZJ_pGfaSiA" name="Profile Definition" description="A viewpoint allowing profile definition with UML" representationKinds="_UekVgHDwEeWh-MssWmCB_A _zzf4gHDtEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.profile.definition"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.emf/model/infra-emf.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.common/model/notation.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.common/model/gmfdiag-common.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.services.controlmode/model/controlmode.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.services.edit/model/marker.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.types.rulebased/model/rulebased.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.stereotype.edition/model/stereotype-edit.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/StandardProfile.elementtypesconfigurations#_jfoLkGT_EeSEqNuV3JpFCA"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types.ui/model/uml-advice.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
-  </contexts>
-</architecture:ArchitectureDomain>
+<?xml version="1.0" encoding="UTF-8"?>

+<architecture:ArchitectureDomain xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:gmfdiagrepresentation="http://www.eclipse.org/papyrus/infra/gmfdiag/representation" xmlns:nattablerepresentation="http://www.eclipse.org/papyrus/infra/nattable/representation" xmi:id="_HQhf4MSYEeaKZJ_pGfaSiA" name="Software Engineering" description="The domain of developing software systems">

+  <stakeholders xmi:id="_HQhf4cSYEeaKZJ_pGfaSiA" name="Software Engineer" description="An engineer interested in software development" concerns="_HQhf4sSYEeaKZJ_pGfaSiA _HQhf48SYEeaKZJ_pGfaSiA _HQhf5MSYEeaKZJ_pGfaSiA"/>

+  <stakeholders xmi:id="_IigrMMSjEeaCPPhpB0_9OQ" name="Domain Architect" concerns="_NxfRgMSjEeaCPPhpB0_9OQ"/>

+  <concerns xmi:id="_NxfRgMSjEeaCPPhpB0_9OQ" name="Profiles" description="The concern of defining the domain profiles"/>

+  <concerns xmi:id="_HQhf4sSYEeaKZJ_pGfaSiA" name="Use Cases" description="The concern of defining the system's use cases"/>

+  <concerns xmi:id="_HQhf48SYEeaKZJ_pGfaSiA" name="Structure" description="The concern of developing the system's structure"/>

+  <concerns xmi:id="_HQhf5MSYEeaKZJ_pGfaSiA" name="Behavior" description="The concern of developing the system's behavior"/>

+  <contexts xsi:type="architecture:ArchitectureDescriptionLanguage" xmi:id="_HQhf5cSYEeaKZJ_pGfaSiA" name="UML" description="The Unified Modeling Language" id="org.eclipse.papyrus.infra.services.edit.TypeContext" icon="platform:/plugin/org.eclipse.papyrus.uml.architecture/icons/uml.gif" creationCommandClass="org.eclipse.papyrus.uml.diagram.common.commands.CreateUMLModelCommand">

+    <viewpoints xmi:id="_HQhf5sSYEeaKZJ_pGfaSiA" name="Software Analysis" description="A viewpoint allowing software analysis with UML" representationKinds="_yeY0sHDvEeWh-MssWmCB_A _zzf4gHDtEeWh-MssWmCB_A _zzf4cXDtEeWh-MssWmCB_A _P3J1cEb7EeRVGbM3cmVSqQ _Uz8agHDcEeWh-MssWmCB_A _P3J1cEa7EeSVGbM3cmVSqQ _WC1q0P4UEhSRsNBVzfUrzA _wXztQHDwEwWh-MssWmCB_A" id="org.eclipse.papyrus.uml.analysis"/>

+    <viewpoints xmi:id="_OOrIUMSZEeaKZJ_pGfaSiA" name="Software Design" description="A viewpoint allowing software design with UML" representationKinds="_UzcgsHDtEeWh-MssWmCB_A _zzf4gHDtEeWh-MssWmCB_A _jRtroHDuEeWh-MssWmCB_A _fa4kAHDuEeWh-MssWmCB_A _fa4kBHDuEeWh-MssWmCB_A _bKiwMHDuEeWh-MssWmCB_A _bKiwNHDuEeWh-MssWmCB_A _ARGokHDuEeWh-MssWmCB_A _zzf4YHDtEeWh-MssWmCB_A _FuMjYHDuEeWh-MssWmCB_A _zzf4cXDtEeWh-MssWmCB_A _TR15IHDvEeWh-MssWmCB_A _PwD0cHDvEeWh-MssWmCB_A _LzyMIHDvEeWh-MssWmCB_A _P3J1cEb7EeRVGbM3cmVSqQ _Uz8agHDcEeWh-MssWmCB_A _P3J1cEa7EeSVGbM3cmVSqQ _WC1q0P4UEhSRsNBVzfUrzA _wXztQHDwEwWh-MssWmCB_A" id="org.eclipse.papyrus.uml.design"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.emf/model/infra-emf.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.common/model/notation.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.common/model/gmfdiag-common.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontents.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontext.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.nattable.common/model/nattable-common.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.services.controlmode/model/controlmode.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.services.edit/model/marker.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.types.rulebased/model/rulebased.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.elementtypesconfigurations#_x8G0YGaNEeSyJIsxLao1Pw"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.communication/model/communicationdiagram.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.elementtypesconfigurations#_tL86sLazEeSbnofizoRSMQ"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.interactionoverview/model/interactionOverviewDiagram.elementtypesconfigurations#_x8G0YGaNEeSyJIsxLao1Pw"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.sequence/model/sequencediagram-uml.elementtypesconfigurations#_BJMa0PyeEeWbo9Y7g2MLdw"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram.elementtypesconfigurations#_wYwtMMeDEeSwP_9Vn5UnWg"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.stereotype.edition/model/stereotype-edit.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.timing/model/timingdiagram-uml.elementtypesconfigurations#_BJMa0PyeEeWbo9Y7g2MLdw"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/StandardProfile.elementtypesconfigurations#_jfoLkGT_EeSEqNuV3JpFCA"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types.ui/model/uml-advice.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>

+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_UzcgsHDtEeWh-MssWmCB_A" name="Activity Diagram" concerns="_HQhf5MSYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.activity/icons/obj16/Diagram_Activity.gif" implementationID="PapyrusUMLActivityDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.activity.CreateActivityDiagramCommand">

+      <modelRules xmi:id="_UzcgsXDtEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity"/>

+      </modelRules>

+      <owningRules xmi:id="_UzcgsnDtEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity"/>

+      </owningRules>

+      <owningRules xmi:id="_Uzcgs3DtEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>

+        <newModelPath xmi:id="_UzcgtHDtEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Activity">

+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>

+        </newModelPath>

+      </owningRules>

+      <owningRules xmi:id="_UzcgtXDtEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>

+        <newModelPath xmi:id="_UzcgtnDtEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Activity">

+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>

+        </newModelPath>

+      </owningRules>

+      <owningRules xmi:id="_Uzcgt3DtEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

+        <newModelPath xmi:id="_UzcguHDtEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Activity">

+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>

+        </newModelPath>

+      </owningRules>

+      <childRules xmi:id="_UzcguXDtEeWh-MssWmCB_A"/>

+      <palettes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.activity/model/PapyrusUMLActivityDiagram.paletteconfiguration#/"/>

+    </representationKinds>

+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_zzf4gHDtEeWh-MssWmCB_A" name="Class Diagram" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/icons/obj16/Diagram_Class.gif" implementationID="PapyrusUMLClassDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand">

+      <modelRules xmi:id="_zzf4gXDtEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

+      </modelRules>

+      <owningRules xmi:id="_zzf4gnDtEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

+      </owningRules>

+      <childRules xmi:id="_zzf4g3DtEeWh-MssWmCB_A"/>

+      <palettes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/model/PapyrusUMLClassDiagram.paletteconfiguration#/"/>

+    </representationKinds>

+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_zzf4YHDtEeWh-MssWmCB_A" name="Inner Class Diagram" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/icons/obj16/Diagram_Class.gif" implementationID="PapyrusUMLClassDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand">

+      <modelRules xmi:id="_zzf4YXDtEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

+      </modelRules>

+      <owningRules xmi:id="_zzf4YnDtEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

+      </owningRules>

+      <owningRules xmi:id="_zzf4Y3DtEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

+      </owningRules>

+      <childRules xmi:id="_zzf4ZHDtEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>

+        <origin href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

+        <insertionPath xmi:id="_zzf4ZXDtEeWh-MssWmCB_A">

+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>

+        </insertionPath>

+      </childRules>

+      <childRules xmi:id="_zzf4ZnDtEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Comment"/>

+        <origin href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

+        <insertionPath xmi:id="_zzf4Z3DtEeWh-MssWmCB_A">

+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedComment"/>

+        </insertionPath>

+      </childRules>

+      <paletteRules xmi:id="_zzf4aHDtEeWh-MssWmCB_A" element="clazz.tool.class"/>

+      <paletteRules xmi:id="_zzf4aXDtEeWh-MssWmCB_A" element="clazz.tool.comment"/>

+      <paletteRules xmi:id="_zzf4anDtEeWh-MssWmCB_A" element="clazz.tool.interface"/>

+      <paletteRules xmi:id="_zzf4a3DtEeWh-MssWmCB_A" element="clazz.tool.abstraction"/>

+      <paletteRules xmi:id="_zzf4bHDtEeWh-MssWmCB_A" element="clazz.tool.association"/>

+      <paletteRules xmi:id="_zzf4bXDtEeWh-MssWmCB_A" element="clazz.tool.generalization"/>

+      <paletteRules xmi:id="_zzf4bnDtEeWh-MssWmCB_A" element="clazz.tool.generalizationset"/>

+      <paletteRules xmi:id="_zzf4b3DtEeWh-MssWmCB_A" permit="false" element="clazz.tool.*"/>

+      <paletteRules xmi:id="_zzf4cHDtEeWh-MssWmCB_A" element=""/>

+    </representationKinds>

+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_zzf4cXDtEeWh-MssWmCB_A" name="Package Diagram" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/icons/Diagram_Package.gif" implementationID="PapyrusUMLClassDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand">

+      <modelRules xmi:id="_zzf4cnDtEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

+      </modelRules>

+      <owningRules xmi:id="_zzf4c3DtEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

+      </owningRules>

+      <childRules xmi:id="_zzf4dHDtEeWh-MssWmCB_A"/>

+      <paletteRules xmi:id="_zzf4dXDtEeWh-MssWmCB_A" element="clazz.tool.comment"/>

+      <paletteRules xmi:id="_zzf4dnDtEeWh-MssWmCB_A" element="clazz.tool.constraint"/>

+      <paletteRules xmi:id="_zzf4d3DtEeWh-MssWmCB_A" element="clazz.tool.model"/>

+      <paletteRules xmi:id="_zzf4eHDtEeWh-MssWmCB_A" element="clazz.tool.package"/>

+      <paletteRules xmi:id="_zzf4eXDtEeWh-MssWmCB_A" element="clazz.tool.abstraction"/>

+      <paletteRules xmi:id="_zzf4enDtEeWh-MssWmCB_A" element="clazz.tool.dependency"/>

+      <paletteRules xmi:id="_zzf4e3DtEeWh-MssWmCB_A" element="clazz.tool.packageimport"/>

+      <paletteRules xmi:id="_zzf4fHDtEeWh-MssWmCB_A" element="clazz.tool.link"/>

+      <paletteRules xmi:id="_zzf4fXDtEeWh-MssWmCB_A" element="clazz.tool.containmentlink"/>

+      <paletteRules xmi:id="_zzf4fnDtEeWh-MssWmCB_A" permit="false" element="clazz.tool.*"/>

+      <paletteRules xmi:id="_zzf4f3DtEeWh-MssWmCB_A" element=""/>

+    </representationKinds>

+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_jRtroHDuEeWh-MssWmCB_A" name="Communication Diagram" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.communication/icons/obj16/Diagram_Communication.gif" implementationID="PapyrusUMLCommunicationDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.communication.CreateCommunicationDiagramCommand">

+      <modelRules xmi:id="_jRtroXDuEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Interaction"/>

+      </modelRules>

+      <owningRules xmi:id="_jRtronDuEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Interaction"/>

+      </owningRules>

+      <owningRules xmi:id="_jRtro3DuEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>

+        <newModelPath xmi:id="_jRtrpHDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">

+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>

+        </newModelPath>

+      </owningRules>

+      <owningRules xmi:id="_jRtrpXDuEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>

+        <newModelPath xmi:id="_jRtrpnDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">

+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>

+        </newModelPath>

+      </owningRules>

+      <owningRules xmi:id="_jRtrp3DuEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

+        <newModelPath xmi:id="_jRtrqHDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">

+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>

+        </newModelPath>

+      </owningRules>

+      <childRules xmi:id="_jRtrqXDuEeWh-MssWmCB_A"/>

+      <palettes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.communication/model/PapyrusUMLCommunicationDiagram.paletteconfiguration#/"/>

+    </representationKinds>

+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_fa4kAHDuEeWh-MssWmCB_A" name="Component Diagram" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.component/icons/obj16/ComponentDiagram.gif" implementationID="PapyrusUMLComponentDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand">

+      <modelRules xmi:id="_fa4kAXDuEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

+      </modelRules>

+      <owningRules xmi:id="_fa4kAnDuEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

+      </owningRules>

+      <childRules xmi:id="_fa4kA3DuEeWh-MssWmCB_A"/>

+      <palettes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.component/model/PapyrusUMLComponentDiagram.paletteconfiguration#/"/>

+    </representationKinds>

+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_fa4kBHDuEeWh-MssWmCB_A" name="Component Diagram" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.component/icons/obj16/ComponentDiagram.gif" implementationID="PapyrusUMLComponentDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand">

+      <modelRules xmi:id="_fa4kBXDuEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>

+      </modelRules>

+      <owningRules xmi:id="_fa4kBnDuEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>

+      </owningRules>

+      <owningRules xmi:id="_fa4kB3DuEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

+      </owningRules>

+      <childRules xmi:id="_fa4kCHDuEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>

+        <origin href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>

+        <insertionPath xmi:id="_fa4kCXDuEeWh-MssWmCB_A">

+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>

+        </insertionPath>

+      </childRules>

+      <childRules xmi:id="_fa4kCnDuEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Comment"/>

+        <origin href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>

+        <insertionPath xmi:id="_fa4kC3DuEeWh-MssWmCB_A">

+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedComment"/>

+        </insertionPath>

+      </childRules>

+      <childRules xmi:id="_fa4kDHDuEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Constraint"/>

+        <origin href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>

+        <insertionPath xmi:id="_fa4kDXDuEeWh-MssWmCB_A">

+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedRule"/>

+        </insertionPath>

+      </childRules>

+      <childRules xmi:id="_fa4kDnDuEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>

+        <origin href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>

+        <insertionPath xmi:id="_fa4kD3DuEeWh-MssWmCB_A">

+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//EncapsulatedClassifier/ownedPort"/>

+        </insertionPath>

+      </childRules>

+      <paletteRules xmi:id="_fa4kEHDuEeWh-MssWmCB_A" permit="false" element="component.tool.model"/>

+      <paletteRules xmi:id="_fa4kEXDuEeWh-MssWmCB_A" permit="false" element="component.tool.package"/>

+    </representationKinds>

+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_bKiwMHDuEeWh-MssWmCB_A" name="Composite Structure Diagram" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.composite/icons/obj16/Diagram_CompositeStructure.gif" implementationID="CompositeStructure" creationCommandClass="org.eclipse.papyrus.uml.diagram.composite.CreateCompositeDiagramCommand">

+      <modelRules xmi:id="_bKiwMXDuEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

+      </modelRules>

+      <owningRules xmi:id="_bKiwMnDuEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

+      </owningRules>

+      <childRules xmi:id="_bKiwM3DuEeWh-MssWmCB_A"/>

+      <palettes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.composite/model/CompositeStructure.paletteconfiguration#/"/>

+    </representationKinds>

+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_bKiwNHDuEeWh-MssWmCB_A" name="Composite Structure Diagram" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.composite/icons/obj16/Diagram_CompositeStructure.gif" implementationID="CompositeStructure" creationCommandClass="org.eclipse.papyrus.uml.diagram.composite.CreateCompositeDiagramCommand">

+      <modelRules xmi:id="_bKiwNXDuEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier"/>

+      </modelRules>

+      <owningRules xmi:id="_bKiwNnDuEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier"/>

+      </owningRules>

+      <owningRules xmi:id="_bKiwN3DuEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

+      </owningRules>

+      <childRules xmi:id="_bKiwOHDuEeWh-MssWmCB_A"/>

+    </representationKinds>

+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_ARGokHDuEeWh-MssWmCB_A" name="Deployment Diagram" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.deployment/icons/obj16/DeploymentDiagram.gif" implementationID="PapyrusUMLDeploymentDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.deployment.CreateDeploymentDiagramCommand">

+      <modelRules xmi:id="_ARGokXDuEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

+      </modelRules>

+      <owningRules xmi:id="_ARGoknDuEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

+      </owningRules>

+      <childRules xmi:id="_ARGok3DuEeWh-MssWmCB_A"/>

+      <palettes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.deployment/model/PapyrusUMLDeploymentDiagram.paletteconfiguration#/"/>

+    </representationKinds>

+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_FuMjYHDuEeWh-MssWmCB_A" name="Interaction Overview Diagram" concerns="_HQhf5MSYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.interactionoverview/icons/obj16/interactionOverviewDiagram.gif" implementationID="PapyrusUMLInteractionOverviewDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.interactionoverview.InteractionOverviewDiagramCreateCommand">

+      <modelRules xmi:id="_FuMjYXDuEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity"/>

+      </modelRules>

+      <owningRules xmi:id="_FuMjYnDuEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity"/>

+      </owningRules>

+      <owningRules xmi:id="_FuMjY3DuEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>

+        <newModelPath xmi:id="_FuMjZHDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Activity">

+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>

+        </newModelPath>

+      </owningRules>

+      <owningRules xmi:id="_FuMjZXDuEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>

+        <newModelPath xmi:id="_FuMjZnDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Activity">

+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>

+        </newModelPath>

+      </owningRules>

+      <owningRules xmi:id="_FuMjZ3DuEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

+        <newModelPath xmi:id="_FuMjaHDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Activity">

+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>

+        </newModelPath>

+      </owningRules>

+      <childRules xmi:id="_FuMjaXDuEeWh-MssWmCB_A"/>

+      <palettes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.interactionoverview/palettes/PapyrusInteractionOverviewDiagram.paletteconfiguration#/"/>

+    </representationKinds>

+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_UekVgHDwEeWh-MssWmCB_A" name="Profile Diagram" concerns="_NxfRgMSjEeaCPPhpB0_9OQ" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.profile/icons/obj16/Diagram_Profile.gif" implementationID="PapyrusUMLProfileDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.profile.CreateProfileDiagramCommand">

+      <modelRules xmi:id="_UekVgXDwEeWh-MssWmCB_A">

+        <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_UekVgnDwEeWh-MssWmCB_A" name="IsContainedByProfile">

+          <constraintType href="platform:/plugin/org.eclipse.papyrus.infra.constraints/Model/ConstraintEnvironment.xmi#//@constraintTypes.4"/>

+          <properties xsi:type="constraints:ValueProperty" xmi:id="_UekVg3DwEeWh-MssWmCB_A" name="className" value="org.eclipse.papyrus.infra.viewpoints.policy.query.IsContainedByProfileQuery"/>

+        </constraints>

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

+      </modelRules>

+      <owningRules xmi:id="_UekVhHDwEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

+      </owningRules>

+      <owningRules xmi:id="_UekVhXDwEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Profile"/>

+      </owningRules>

+      <childRules xmi:id="_UekVhnDwEeWh-MssWmCB_A"/>

+      <palettes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.profile/model/PapyrusUMLProfileDiagram.paletteconfiguration#/"/>

+    </representationKinds>

+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_TR15IHDvEeWh-MssWmCB_A" name="Sequence Diagram" concerns="_HQhf5MSYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.sequence/icons/obj16/Diagram_Sequence.gif" implementationID="PapyrusUMLSequenceDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.sequence.CreateSequenceDiagramCommand">

+      <modelRules xmi:id="_TR15IXDvEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Interaction"/>

+      </modelRules>

+      <owningRules xmi:id="_TR15InDvEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Interaction"/>

+      </owningRules>

+      <owningRules xmi:id="_TR15I3DvEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>

+        <newModelPath xmi:id="_TR15JHDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">

+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>

+        </newModelPath>

+      </owningRules>

+      <owningRules xmi:id="_TR15JXDvEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>

+        <newModelPath xmi:id="_TR15JnDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">

+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>

+        </newModelPath>

+      </owningRules>

+      <owningRules xmi:id="_TR15J3DvEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

+        <newModelPath xmi:id="_TR15KHDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">

+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>

+        </newModelPath>

+      </owningRules>

+      <owningRules xmi:id="_TR15KXDvEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//UseCase"/>

+        <newModelPath xmi:id="_TR15KnDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">

+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>

+        </newModelPath>

+      </owningRules>

+      <childRules xmi:id="_TR15K3DvEeWh-MssWmCB_A"/>

+      <palettes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.sequence/model/PapyrusUMLSequenceDiagram.paletteconfiguration#/"/>

+    </representationKinds>

+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_PwD0cHDvEeWh-MssWmCB_A" name="State Machine Diagram" concerns="_HQhf5MSYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.statemachine/icons/obj16/Diagram_StateMachine.gif" implementationID="PapyrusUMLStateMachineDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.statemachine.CreateStateMachineDiagramCommand">

+      <modelRules xmi:id="_PwD0cXDvEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//StateMachine"/>

+      </modelRules>

+      <modelRules xmi:id="_H-oCgB0UEea_bcpknMJ7-w">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//State"/>

+      </modelRules>

+      <owningRules xmi:id="_PwD0cnDvEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//StateMachine"/>

+      </owningRules>

+      <owningRules xmi:id="_PwD0c3DvEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>

+        <newModelPath xmi:id="_PwD0dHDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.StateMachine">

+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>

+        </newModelPath>

+      </owningRules>

+      <owningRules xmi:id="_PwD0dXDvEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>

+        <newModelPath xmi:id="_PwD0dnDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.StateMachine">

+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>

+        </newModelPath>

+      </owningRules>

+      <owningRules xmi:id="_PwD0d3DvEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

+        <newModelPath xmi:id="_PwD0eHDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.StateMachine">

+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>

+        </newModelPath>

+      </owningRules>

+      <owningRules xmi:id="_PwD0eXDvEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>

+        <newModelPath xmi:id="_PwD0enDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.ProtocolStateMachine">

+          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface/protocol"/>

+        </newModelPath>

+      </owningRules>

+      <owningRules xmi:id="_5kmMcB0UEea_bcpknMJ7-w">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//State"/>

+      </owningRules>

+      <childRules xmi:id="_PwD0e3DvEeWh-MssWmCB_A"/>

+      <palettes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.statemachine/model/PapyrusUMLStateMachineDiagram.paletteconfiguration#/"/>

+    </representationKinds>

+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_LzyMIHDvEeWh-MssWmCB_A" name="Timing Diagram" concerns="_HQhf5MSYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.timing/icons/obj16/Diagram_Timing.gif" implementationID="PapyrusUMLTimingDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.timing.custom.CreateTimingDiagramCommand">

+      <modelRules xmi:id="_LzyMIXDvEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

+      </modelRules>

+      <owningRules xmi:id="_LzyMInDvEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

+      </owningRules>

+      <childRules xmi:id="_LzyMI3DvEeWh-MssWmCB_A"/>

+    </representationKinds>

+    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_yeY0sHDvEeWh-MssWmCB_A" name="Use Case Diagram" concerns="_HQhf4sSYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.usecase/icons/obj16/Diagram_UseCase.gif" implementationID="UseCase" customStyle="platform:/plugin/org.eclipse.papyrus.uml.diagram.usecase/models/usecase.css" creationCommandClass="org.eclipse.papyrus.uml.diagram.usecase.CreateUseCaseDiagramCommand">

+      <modelRules xmi:id="_yeY0sXDvEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

+      </modelRules>

+      <modelRules xmi:id="_yeY0snDvEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

+      </modelRules>

+      <owningRules xmi:id="_yeY0s3DvEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

+      </owningRules>

+      <owningRules xmi:id="_yeY0tHDvEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

+      </owningRules>

+      <childRules xmi:id="_yeY0tXDvEeWh-MssWmCB_A"/>

+      <palettes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.usecase/models/UseCase.paletteconfiguration#/"/>

+    </representationKinds>

+    <representationKinds xsi:type="nattablerepresentation:PapyrusTable" xmi:id="_P3J1cEa7EeSVGbM3cmVSqQ" name="Generic Tree Table" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.nattable/icons/uml_generic_table.png" implementationID="PapyrusUMLGenericTreeTable">

+      <modelRules xmi:id="_vZwgkEr7EeSVGbM3cmVSqQ">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

+      </modelRules>

+      <owningRules xmi:id="_vZwgkUr7EeSVGbM3cmVSqQ">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

+      </owningRules>

+      <configuration href="platform:/plugin/org.eclipse.papyrus.uml.nattable/configs/genericTreeTable.nattableconfiguration#/"/>

+    </representationKinds>

+    <representationKinds xsi:type="nattablerepresentation:PapyrusTable" xmi:id="_P3J1cEb7EeRVGbM3cmVSqQ" name="Class Tree Table" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table.png" implementationID="PapyrusClassTreeTable">

+      <modelRules xmi:id="_vZwgkEr7EeSVGbM3cmVSqQ">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

+      </modelRules>

+      <owningRules xmi:id="_vZwgkUr7EeSVGbM3cmVSqQ">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

+      </owningRules>

+      <configuration href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>

+    </representationKinds>

+    <representationKinds xsi:type="nattablerepresentation:PapyrusTable" xmi:id="_Uz8agHDcEeWh-MssWmCB_A" name="Generic Table" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table.png" implementationID="PapyrusGenericTable">

+      <modelRules xmi:id="_Uz8agXDuEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>

+      </modelRules>

+      <owningRules xmi:id="_Uz8agnDuEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>

+      </owningRules>

+      <configuration href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#/"/>

+    </representationKinds>

+    <representationKinds xsi:type="nattablerepresentation:PapyrusTable" xmi:id="_WC1q0P4UEhSRsNBVzfUrzA" name="Stereotype Display Tree Table" concerns="_NxfRgMSjEeaCPPhpB0_9OQ" icon="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table.png" implementationID="PapyrusStereotypeDisplayTreeTable">

+      <modelRules xmi:id="_7k79wP4VEeSRsNBVzfUrzA">

+        <element href="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//View"/>

+      </modelRules>

+      <owningRules xmi:id="_AJmbwP4WEeSRsNBVzfUrzA">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

+      </owningRules>

+      <configuration href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotype.display/config/stereotype.nattableconfiguration#/"/>

+    </representationKinds>

+    <representationKinds xsi:type="nattablerepresentation:PapyrusTable" xmi:id="_wXztQHDwEwWh-MssWmCB_A" name="View Table" concerns="_HQhf48SYEeaKZJ_pGfaSiA" icon="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/icons/nattablepageeditor.png" implementationID="PapyrusViewsTable">

+      <modelRules xmi:id="_wXztQXDwEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>

+      </modelRules>

+      <owningRules xmi:id="_wXztQnDwEeWh-MssWmCB_A">

+        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>

+      </owningRules>

+      <configuration href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#/"/>

+    </representationKinds>

+    <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>

+  </contexts>

+  <contexts xsi:type="architecture:ArchitectureFramework" xmi:id="__ZqwAMSlEeaCPPhpB0_9OQ" name="Profile" description="The Profile Definition Framework" id="org.eclipse.papyrus.uml.architecture.Profile" icon="platform:/plugin/org.eclipse.papyrus.uml.architecture/icons/profile.gif" extensionPrefix="profile" creationCommandClass="org.eclipse.papyrus.uml.diagram.profile.CreateProfileModelCommand">

+    <viewpoints xmi:id="_hoXx0MSiEeaKZJ_pGfaSiA" name="Profile Definition" description="A viewpoint allowing profile definition with UML" representationKinds="_UekVgHDwEeWh-MssWmCB_A _zzf4gHDtEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.profile.definition"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.emf/model/infra-emf.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.common/model/notation.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.common/model/gmfdiag-common.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.services.controlmode/model/controlmode.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.services.edit/model/marker.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.types.rulebased/model/rulebased.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.stereotype.edition/model/stereotype-edit.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/StandardProfile.elementtypesconfigurations#_jfoLkGT_EeSEqNuV3JpFCA"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>

+    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.service.types.ui/model/uml-advice.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>

+  </contexts>

+</architecture:ArchitectureDomain>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml
index 272d89bd7c7..b6a60aa3f07 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml
@@ -2176,22 +2176,5 @@ self.structuralFeature.oclAsType(Property).opposite.type = self.object.type]]>
 	<initializer class="org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.AutomatedModelCompletionPreferencesInitializer"/>
 </extension>
 
-<extension point="org.eclipse.papyrus.infra.gmfdiag.common.paletteDefinition">
-	<?gmfgen generated="true"?>
-	<paletteDefinition
-		ID="org.eclipse.papyrus.uml.diagram.activity.paletteconfiguration"
-		class="org.eclipse.papyrus.infra.gmfdiag.common.service.palette.ExtendedPluginPaletteProvider"
-		name="Papyrus activity editor Plugin Palette"
-		path="model/PapyrusUMLActivityDiagram.paletteconfiguration"
-		provider="Eclipse Modeling Project">
-		<Priority
-			name="Lowest">
-		</Priority>
-		<!-- Specify diagram to which this palette tool relates -->
-		<editor
-			id="org.eclipse.papyrus.uml.diagram.activity">
-		</editor>
-	</paletteDefinition>
-</extension>
 
 </plugin>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/messages.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/messages.properties
index 0136e909aa0..9ffc8cdf4ab 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/messages.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/messages.properties
@@ -64,8 +64,8 @@ DurationObservation7CreationTool_title=DurationObservation
 DurationObservation7CreationTool_desc=Create new DurationObservation
 Enumeration8CreationTool_title=Enumeration
 Enumeration8CreationTool_desc=Create an enumeration
-Enumerationliteral9CreationTool_title=Enumeration literal
-Enumerationliteral9CreationTool_desc=Create an enumeration literal
+EnumerationLiteral9CreationTool_title=Enumeration literal
+EnumerationLiteral9CreationTool_desc=Create an enumeration literal
 Interface10CreationTool_title=Interface
 Interface10CreationTool_desc=Create an interface
 InstanceSpecification11CreationTool_title=InstanceSpecification
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml
index 93ee6218d1b..8ed35b46937 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml
@@ -1012,24 +1012,7 @@
       <binding context="org.eclipse.papyrus.uml.diagram.clazz.TypeContext">
          <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
       </binding>
-   </extension>
-<extension point="org.eclipse.papyrus.infra.gmfdiag.common.paletteDefinition">

-	<?gmfgen generated="true"?>

-	<paletteDefinition

-		ID="org.eclipse.papyrus.uml.diagram.clazz.paletteconfiguration"

-		class="org.eclipse.papyrus.infra.gmfdiag.common.service.palette.ExtendedPluginPaletteProvider"

-		name="PapyrusUMLClassDiagram Palette"

-		path="model/PapyrusUMLClassDiagram.paletteconfiguration"

-		provider="Eclipse Modeling Project">

-		<Priority

-			name="Lowest">

-		</Priority>

-		<!-- Specify diagram to which this palette tool relates -->

-		<editor

-			id="org.eclipse.papyrus.uml.diagram.clazz">

-		</editor>

-	</paletteDefinition>

-</extension>

+   </extension>

 
 
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/plugin.xml
index 0519fd170a9..4842c0b8c07 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/plugin.xml
@@ -390,22 +390,5 @@
          </visualTypeProvider>

    </extension>

 

-<extension point="org.eclipse.papyrus.infra.gmfdiag.common.paletteDefinition">

-	<?gmfgen generated="true"?>

-	<paletteDefinition

-		ID="org.eclipse.papyrus.uml.diagram.communication.paletteconfiguration"

-		class="org.eclipse.papyrus.infra.gmfdiag.common.service.palette.ExtendedPluginPaletteProvider"

-		name="org.eclipse.papyrus.uml.diagram.communication Palette"

-		path="model/PapyrusUMLCommunicationDiagram.paletteconfiguration"

-		provider="Eclipse Modeling Project">

-		<Priority

-			name="Lowest">

-		</Priority>

-		<!-- Specify diagram to which this palette tool relates -->

-		<editor

-			id="org.eclipse.papyrus.uml.diagram.communication">

-		</editor>

-	</paletteDefinition>

-</extension>

 

 </plugin>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml
index 462c35a9b7f..8b3a61b19f1 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml
@@ -606,23 +606,6 @@
             diagramType="PapyrusUMLComponentDiagram">
          </visualTypeProvider>
    </extension>
-
-<extension point="org.eclipse.papyrus.infra.gmfdiag.common.paletteDefinition">

-	<?gmfgen generated="true"?>

-	<paletteDefinition

-		ID="org.eclipse.papyrus.uml.diagram.component.paletteconfiguration"

-		class="org.eclipse.papyrus.infra.gmfdiag.common.service.palette.ExtendedPluginPaletteProvider"

-		name="Papyrus Component Diagram  Palette"

-		path="model/PapyrusUMLComponentDiagram.paletteconfiguration"

-		provider="Eclipse Modeling Project">

-		<Priority

-			name="Lowest">

-		</Priority>

-		<!-- Specify diagram to which this palette tool relates -->

-		<editor

-			id="org.eclipse.papyrus.uml.diagram.component">

-		</editor>

-	</paletteDefinition>

-</extension>

+

 
 </plugin>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml
index 1d945b3d767..b83cdd7adc8 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml
@@ -1034,22 +1034,5 @@
       </contributor>
 </extension>
 
-<extension point="org.eclipse.papyrus.infra.gmfdiag.common.paletteDefinition">
-	<?gmfgen generated="true"?>
-	<paletteDefinition
-		ID="org.eclipse.papyrus.uml.diagram.composite.paletteconfiguration"
-		class="org.eclipse.papyrus.infra.gmfdiag.common.service.palette.ExtendedPluginPaletteProvider"
-		name="Papyrus Composite Structure Diagram  Palette"
-		path="model/CompositeStructure.paletteconfiguration"
-		provider="Eclipse Modeling Project">
-		<Priority
-			name="Lowest">
-		</Priority>
-		<!-- Specify diagram to which this palette tool relates -->
-		<editor
-			id="org.eclipse.papyrus.uml.diagram.composite">
-		</editor>
-	</paletteDefinition>
-</extension>
 
 </plugin>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/plugin.xml
index 9d18e645210..42b40be0a64 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/plugin.xml
@@ -458,24 +458,7 @@
       <binding context="org.eclipse.papyrus.uml.diagram.deployment.TypeContext">
          <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
       </binding>
-   </extension>
-<extension point="org.eclipse.papyrus.infra.gmfdiag.common.paletteDefinition">

-	<?gmfgen generated="true"?>

-	<paletteDefinition

-		ID="org.eclipse.papyrus.uml.diagram.deployment.paletteconfiguration"

-		class="org.eclipse.papyrus.infra.gmfdiag.common.service.palette.ExtendedPluginPaletteProvider"

-		name="Papyrus Deployment Diagram  Palette"

-		path="model/PapyrusUMLDeploymentDiagram.paletteconfiguration"

-		provider="Eclipse Modeling Project">

-		<Priority

-			name="Lowest">

-		</Priority>

-		<!-- Specify diagram to which this palette tool relates -->

-		<editor

-			id="org.eclipse.papyrus.uml.diagram.deployment">

-		</editor>

-	</paletteDefinition>

-</extension>

+   </extension>

 

 
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.xml
index 77276d5605b..45b554e03f1 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.xml
@@ -647,20 +647,4 @@
       </visualTypeProvider>
    </extension>
    
-<extension point="org.eclipse.papyrus.infra.gmfdiag.common.paletteDefinition">
-	<paletteDefinition
-		ID="org.eclipse.papyrus.uml.diagram.interactionoverview.paletteconfiguration" 
-		class="org.eclipse.papyrus.infra.gmfdiag.common.service.palette.ExtendedPluginPaletteProvider"
-		name="Papyrus activity editor Plugin Palette" 
-		path="palettes/PapyrusInteractionOverviewDiagram.paletteconfiguration"
-		provider="Eclipse Modeling Project">
-		<Priority
-			name="Lowest">
-		</Priority>
-		<!-- Specify diagram this palette tools relate to -->
-		<editor
-			id="org.eclipse.papyrus.uml.diagram.interactionoverview">
-		</editor>
-	</paletteDefinition>
-</extension>
 </plugin>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.xml
index 3f774646739..95d06b78771 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.xml
@@ -591,23 +591,6 @@
          source="1.1.0"
          target="1.3.0">
    </diagramReconciler>
-</extension>
-<extension point="org.eclipse.papyrus.infra.gmfdiag.common.paletteDefinition">

-	<?gmfgen generated="true"?>

-	<paletteDefinition

-		ID="org.eclipse.papyrus.uml.diagram.profile.paletteconfiguration"

-		class="org.eclipse.papyrus.infra.gmfdiag.common.service.palette.ExtendedPluginPaletteProvider"

-		name="PapyrusUMLProfileDiagram Palette"

-		path="model/PapyrusUMLProfileDiagram.paletteconfiguration"

-		provider="Eclipse Modeling Project">

-		<Priority

-			name="Lowest">

-		</Priority>

-		<!-- Specify diagram to which this palette tool relates -->

-		<editor

-			id="org.eclipse.papyrus.uml.diagram.profile">

-		</editor>

-	</paletteDefinition>

 </extension>

 

 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml
index f9a41e1d2a7..ee4ea90468e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml
@@ -543,22 +543,5 @@
 <extension point="org.eclipse.ui.handlers" id="menu-handlers">
       <?gmfgen generated="true"?>
    </extension>
-<extension point="org.eclipse.papyrus.infra.gmfdiag.common.paletteDefinition">
-	<?gmfgen generated="true"?>
-	<paletteDefinition
-		ID="org.eclipse.papyrus.uml.diagram.sequence.paletteconfiguration"
-		class="org.eclipse.papyrus.infra.gmfdiag.common.service.palette.ExtendedPluginPaletteProvider"
-		name="UML Plugin Palette"
-		path="model/PapyrusUMLSequenceDiagram.paletteconfiguration"
-		provider="Eclipse Modeling Project">
-		<Priority
-			name="Lowest">
-		</Priority>
-		<!-- Specify diagram to which this palette tool relates -->
-		<editor
-			id="org.eclipse.papyrus.uml.diagram.sequence">
-		</editor>
-	</paletteDefinition>
-</extension>
 
 </plugin>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/plugin.xml
index 49748883366..59a1a2f8f0e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/plugin.xml
@@ -511,23 +511,6 @@
 
 <extension point="org.eclipse.papyrus.infra.gmfdiag.assistant.modelProviders">
     <modelProvider uri="model/stateMachineDiagram.assistants"/>
-</extension>
-<extension point="org.eclipse.papyrus.infra.gmfdiag.common.paletteDefinition">

-	<?gmfgen generated="true"?>

-	<paletteDefinition

-		ID="org.eclipse.papyrus.uml.diagram.statemachine.paletteconfiguration"

-		class="org.eclipse.papyrus.infra.gmfdiag.common.service.palette.ExtendedPluginPaletteProvider"

-		name="PapyrusUMLStateMachineDiagram Palette"

-		path="model/PapyrusUMLStateMachineDiagram.paletteconfiguration"

-		provider="Eclipse Modeling Project">

-		<Priority

-			name="Lowest">

-		</Priority>

-		<!-- Specify diagram to which this palette tool relates -->

-		<editor

-			id="org.eclipse.papyrus.uml.diagram.statemachine">

-		</editor>

-	</paletteDefinition>

 </extension>

 

 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.xml
index 5b9dd7321ad..0d8bd6be06a 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.xml
@@ -653,24 +653,7 @@
             class="org.eclipse.papyrus.uml.diagram.usecase.providers.UMLVisualTypeProvider"
             diagramType="UseCase">
          </visualTypeProvider>
-   </extension>
-<extension point="org.eclipse.papyrus.infra.gmfdiag.common.paletteDefinition">

-	<?gmfgen generated="true"?>

-	<paletteDefinition

-		ID="org.eclipse.papyrus.uml.diagram.usecase.paletteconfiguration"

-		class="org.eclipse.papyrus.infra.gmfdiag.common.service.palette.ExtendedPluginPaletteProvider"

-		name="Papyrus useCase editor Plugin Palette"

-		path="models/UseCase.paletteconfiguration"

-		provider="Eclipse Modeling Project">

-		<Priority

-			name="Lowest">

-		</Priority>

-		<!-- Specify diagram to which this palette tool relates -->

-		<editor

-			id="org.eclipse.papyrus.uml.diagram.usecase">

-		</editor>

-	</paletteDefinition>

-</extension>

+   </extension>