Merge branch 'refs/heads/master' into bugs/402525-widgets

Conflicts:
	tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF

41 files changed, 6789 insertions, 6824 deletions

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowsContentProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowsContentProvider.java
index 48690ff6ae3..f3482d4a5ed 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowsContentProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowsContentProvider.java
@@ -23,6 +23,7 @@ import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChanged
 import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;

 import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;

 import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;

+import org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer;

 import org.eclipse.swt.SWT;

 

 /**

@@ -95,42 +96,26 @@ public class SimpleSashWindowsContentProvider implements ISashWindowsContentProv
 	 * Add the page which should be an IPageModel instance. {@inheritDoc}

 	 */

 	public void addPage(Object newModel, int index) {

-		addPage((IPageModel)newModel, index);

+		addPage(index, (IPageModel)newModel);

 	}

 

-	/**

-	 * 

-	 * {@inheritDoc}

-	 */

 	public void addPage(IPageModel newModel) {

 		currentTabFolder.doAddItem(newModel);

 		firePropertyChanged(new ContentEvent(ContentEvent.ADDED, this, newModel));

 	}

 

-	/**

-	 * 

-	 * {@inheritDoc}

-	 */

 	public void addPage(ITabFolderModel toFolderModel, IPageModel newModel) {

 		TabFolderModel srcFolder = (TabFolderModel)toFolderModel;

 		srcFolder.doAddItem(newModel);

 		firePropertyChanged(new ContentEvent(ContentEvent.ADDED, this, newModel));

 	}

 

-	/**

-	 * 

-	 * {@inheritDoc}

-	 */

-	public void addPage(IPageModel newModel, int index) {

+	public void addPage(int index, IPageModel newModel) {

 		currentTabFolder.doAddItem(index, newModel);

 		firePropertyChanged(new ContentEvent(ContentEvent.ADDED, this, newModel));

 	}

 

-	/**

-	 * 

-	 * {@inheritDoc}

-	 */

-	public void addPage(ITabFolderModel toFolderModel, IPageModel newModel, int index) {

+	public void addPage(ITabFolderModel toFolderModel, int index, IPageModel newModel) {

 		TabFolderModel srcFolder = (TabFolderModel)toFolderModel;

 		srcFolder.doAddItem(index, newModel);

 		firePropertyChanged(new ContentEvent(ContentEvent.ADDED, this, newModel));

@@ -184,7 +169,7 @@ public class SimpleSashWindowsContentProvider implements ISashWindowsContentProv
 	 * @param targetFolderModel

 	 */

 	private void doSetCurrentFolder(TabFolderModel newCurrentFolder) {

-		currentTabFolder = (TabFolderModel)newCurrentFolder;

+		currentTabFolder = newCurrentFolder;

 	}

 

 	/**

@@ -192,25 +177,29 @@ public class SimpleSashWindowsContentProvider implements ISashWindowsContentProv
 	 * 

 	 * The change event is sent only once after the complete operation is performed. {@inheritDoc}

 	 * 

-	 * @param referenceFolder The folder used as reference to insert the newly created Folder. 

-	 * @param side The side to which the created folder is inserted. Can be SWT.TOP, DOWN, LEFT, RIGHT.

+	 * @param referenceFolder

+	 *        The folder used as reference to insert the newly created Folder.

+	 * @param side

+	 *        The side to which the created folder is inserted. Can be SWT.TOP, DOWN, LEFT, RIGHT.

 	 */

 	public void createFolder(ITabFolderModel sourceFolder, int tabIndex, ITabFolderModel referenceFolder, int side) {

 		org.eclipse.papyrus.infra.core.sasheditor.Activator.log.debug("createFolder()");

 

-		ITabFolderModel newFolder = doCreateFolder((TabFolderModel)sourceFolder, tabIndex, (TabFolderModel)referenceFolder, side);

+		doCreateFolder((TabFolderModel)sourceFolder, tabIndex, (TabFolderModel)referenceFolder, side);

 		contentChangedListenerManager.fireContentChanged(new ContentEvent(ContentEvent.CHANGED, this, sourceFolder));

 		//		return newFolder;

 	}

 

 	/**

 	 * Create a new folder and insert it at the specified side of the reference folder.

-	 * The change event is sent only once after the complete operation is performed. 

+	 * The change event is sent only once after the complete operation is performed.

 	 * 

 	 * This method is not part of the {@link SashWindowsContainer} API. It is here to help writing junit tests.

 	 * 

-	 * @param referenceFolder The folder used as reference to insert the newly created Folder. 

-	 * @param side The side to which the created folder is inserted. Can be SWT.TOP, DOWN, LEFT, RIGHT.

+	 * @param referenceFolder

+	 *        The folder used as reference to insert the newly created Folder.

+	 * @param side

+	 *        The side to which the created folder is inserted. Can be SWT.TOP, DOWN, LEFT, RIGHT.

 	 */

 	public ITabFolderModel createFolder(ITabFolderModel referenceFolder, int side) {

 		org.eclipse.papyrus.infra.core.sasheditor.Activator.log.debug("createFolder()");

@@ -236,17 +225,17 @@ public class SimpleSashWindowsContentProvider implements ISashWindowsContentProv
 	/**

 	 * Move a tab from folder to folder.

 	 * The tab is added at the end of the target folder.

-	 * The change event is sent only once after the complete operation is performed. {@inheritDoc}

+	 * The change event is sent only once after the complete operation is performed.

 	 */

 	private void doMoveTab(TabFolderModel srcFolderModel, int sourceIndex, TabFolderModel targetFolderModel) {

 

 		// Move all

-		if( sourceIndex < 0) {

+		if(sourceIndex < 0) {

 			targetFolderModel.getChildren().addAll(srcFolderModel.getChildren());

 			srcFolderModel.getChildren().clear();

 			return;

 		}

-		

+

 		IPageModel tab = srcFolderModel.doRemoveTab(sourceIndex);

 		targetFolderModel.doAddItem(tab);

 	}

@@ -292,13 +281,15 @@ public class SimpleSashWindowsContentProvider implements ISashWindowsContentProv
 	 */

 	private void removeEmptyFolder(TabFolderModel tabFolder) {

 		// Check if empty

-		if(tabFolder.getChildren().size() > 0)

+		if(tabFolder.getChildren().size() > 0) {

 			return;

+		}

 

 		AbstractModel parent = tabFolder.getParent();

 		// Forbid removing of the last folder

-		if(parent == rootModel)

+		if(parent == rootModel) {

 			return;

+		}

 

 		// Parent is a sash. Ask it to remove the child and itself

 		((SashPanelModel)parent).delete(tabFolder);

@@ -319,10 +310,11 @@ public class SimpleSashWindowsContentProvider implements ISashWindowsContentProv
 

 		int direction;

 		// Compute sash direction

-		if(side == SWT.LEFT || side == SWT.RIGHT)

+		if(side == SWT.LEFT || side == SWT.RIGHT) {

 			direction = SWT.HORIZONTAL;

-		else

+		} else {

 			direction = SWT.VERTICAL;

+		}

 		// Create sash

 		if(side == SWT.LEFT || side == SWT.UP) {

 			newSash = new SashPanelModel(refParent, folderToInsert, refFolder, direction);

@@ -371,13 +363,13 @@ public class SimpleSashWindowsContentProvider implements ISashWindowsContentProv
 	}

 

 	/**

-	 * Remove the specified tab from its parent. {@inheritDoc}

+	 * Remove the specified tab from its parent.

 	 */

 	public void removePage(IPageModel tabItem) {

 

 		TabFolderModel folder = lookupPageFolder(tabItem);

-//		if(folder != null)

-//			folder.removeTab(tabItem);

+		//		if(folder != null)

+		//			folder.removeTab(tabItem);

 		if(folder != null) {

 			folder.doRemoveTab(tabItem);

 			removeEmptyFolder(folder);

@@ -469,12 +461,14 @@ public class SimpleSashWindowsContentProvider implements ISashWindowsContentProv
 		 * @param listener

 		 */

 		public void addContentChangedListener(IContentChangedListener listener) {

-			if(listeners == null)

+			if(listeners == null) {

 				createListeners();

+			}

 

 			// Check if already exists.

-			if(listeners.contains(listener))

+			if(listeners.contains(listener)) {

 				return;

+			}

 

 			listeners.add(listener);

 		}

@@ -486,8 +480,9 @@ public class SimpleSashWindowsContentProvider implements ISashWindowsContentProv
 		 * @param listener

 		 */

 		public void removeContentChangedListener(IContentChangedListener listener) {

-			if(listeners == null)

+			if(listeners == null) {

 				return;

+			}

 

 			listeners.remove(listener);

 		}

@@ -496,8 +491,9 @@ public class SimpleSashWindowsContentProvider implements ISashWindowsContentProv
 		 * Create the list of listeners.

 		 */

 		private void createListeners() {

-			if(listeners == null)

+			if(listeners == null) {

 				listeners = new ArrayList<IContentChangedListener>();

+			}

 

 		}

 

@@ -507,8 +503,9 @@ public class SimpleSashWindowsContentProvider implements ISashWindowsContentProv
 		 * @param event

 		 */

 		public void fireContentChanged(ContentEvent event) {

-			if(listeners == null)

+			if(listeners == null) {

 				return;

+			}

 

 			for(IContentChangedListener listener : listeners) {

 				listener.contentChanged(event);

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/singlefolder/SingleFolderContentProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/singlefolder/SingleFolderContentProvider.java
index 9fab42698f2..4fba90e6770 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/singlefolder/SingleFolderContentProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/singlefolder/SingleFolderContentProvider.java
@@ -86,23 +86,15 @@ public class SingleFolderContentProvider implements ISashWindowsContentProvider,
 	 * Add the page which should be an IPageModel instance. {@inheritDoc}

 	 */

 	public void addPage(Object newModel, int index) {

-		addPage((IPageModel)newModel, index);

+		addPage(index, (IPageModel)newModel);

 	}

 

-	/**

-	 * 

-	 * {@inheritDoc}

-	 */

 	public void addPage(IPageModel newModel) {

 		currentTabFolder.addItem(newModel);

 

 	}

 

-	/**

-	 * 

-	 * {@inheritDoc}

-	 */

-	public void addPage(IPageModel newModel, int index) {

+	public void addPage(int index, IPageModel newModel) {

 		currentTabFolder.addItem(index, newModel);

 	}

 

@@ -110,7 +102,7 @@ public class SingleFolderContentProvider implements ISashWindowsContentProvider,
 	 * Do nothing because this implementation doesn't allows folders. {@inheritDoc}

 	 */

 	public void createFolder(ITabFolderModel tabFolder, int tabIndex, ITabFolderModel targetFolder, int side) {

-

+		//Nothing

 	}

 

 	/**

@@ -145,10 +137,6 @@ public class SingleFolderContentProvider implements ISashWindowsContentProvider,
 		currentTabFolder.removeTab(index);

 	}

 

-	/**

-	 * 

-	 * {@inheritDoc}

-	 */

 	public void removePage(IPageModel tabItem) {

 		currentTabFolder.removeTab(tabItem);

 	}

@@ -177,6 +165,7 @@ public class SingleFolderContentProvider implements ISashWindowsContentProvider,
 	 * @param rawModel

 	 */

 	public void setCurrentFolder(Object rawModel) {

+		//Nothing

 	}

 

 	/**

@@ -195,12 +184,14 @@ public class SingleFolderContentProvider implements ISashWindowsContentProvider,
 		 * @param listener

 		 */

 		public void addContentChangedListener(IContentChangedListener listener) {

-			if(listeners == null)

+			if(listeners == null) {

 				createListeners();

+			}

 

 			// Check if already exists.

-			if(listeners.contains(listener))

+			if(listeners.contains(listener)) {

 				return;

+			}

 

 			listeners.add(listener);

 		}

@@ -212,8 +203,9 @@ public class SingleFolderContentProvider implements ISashWindowsContentProvider,
 		 * @param listener

 		 */

 		public void removeContentChangedListener(IContentChangedListener listener) {

-			if(listeners == null)

+			if(listeners == null) {

 				return;

+			}

 

 			listeners.remove(listener);

 		}

@@ -222,8 +214,9 @@ public class SingleFolderContentProvider implements ISashWindowsContentProvider,
 		 * Create the list of listeners.

 		 */

 		private void createListeners() {

-			if(listeners == null)

+			if(listeners == null) {

 				listeners = new ArrayList<IContentChangedListener>();

+			}

 

 		}

 

@@ -233,8 +226,9 @@ public class SingleFolderContentProvider implements ISashWindowsContentProvider,
 		 * @param event

 		 */

 		public void fireContentChanged(ContentEvent event) {

-			if(listeners == null)

+			if(listeners == null) {

 				return;

+			}

 

 			for(IContentChangedListener listener : listeners) {

 				listener.contentChanged(event);

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/command/ResetStyleCommand.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/command/ResetStyleCommand.java
index 25cec4c4d63..726386e16b2 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/command/ResetStyleCommand.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/command/ResetStyleCommand.java
@@ -102,8 +102,21 @@ public class ResetStyleCommand extends RecordingCommand {
 			Object styleObject = styleIterator.next();

 			if(styleObject instanceof NamedStyle) {

 				NamedStyle customStyle = (NamedStyle)styleObject;

+

 				if(!CSSStyles.RESERVED_KEYWORDS.contains(customStyle.getName())) {

-					styleIterator.remove();

+

+					//Remove only NamedStyle which are supported by the CSS Implementation

+					//See org.eclipse.papyrus.infra.gmfdiag.css.style.impl.CSSViewDelegate.getCSSNamedStyle(EClass, String)

+					//See Bug 425190 - [CSS] Loss of Notation information when CSS style is applied on Edges.

+					switch(customStyle.eClass().getClassifierID()) {

+					case NotationPackage.STRING_VALUE_STYLE:

+					case NotationPackage.BOOLEAN_VALUE_STYLE:

+					case NotationPackage.INT_VALUE_STYLE:

+					case NotationPackage.DOUBLE_VALUE_STYLE:

+					case NotationPackage.STRING_LIST_VALUE_STYLE:

+						styleIterator.remove();

+					}

+

 				}

 			} else if(styleObject instanceof Style) {

 				resetStyle((Style)styleObject);

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 45243f3c623..7021ed3753b 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
@@ -1,178 +1,179 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-

-<plugin>

-   <extension-point id="nestedEditor" name="NestedEditor" schema="schema/nestedEditor.exsd"/>

-   <extension-point id="initializeView" name="initializeView" schema="schema/initializeView.exsd"/>

-   <extension-point id="shapeProvider" name="ShapeProvider" schema="schema/shapeProvider.exsd"/>

-   <extension-point id="notationTypesMapping" name="notationTypesMapping" schema="schema/notationTypesMapping.exsd"/>

-   <extension-point id="svgPostProcessors" name="svgPostProcessors" schema="schema/svgPostProcessors.exsd"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
 
-<extension

-      point="org.eclipse.ui.handlers">

-   <handler

-         class="org.eclipse.papyrus.infra.gmfdiag.common.handler.RefreshHandler"

-         commandId="org.eclipse.ui.file.refresh">

-      <activeWhen>

-         <with

-               variable="activePartId">

-            <equals

-                  value="org.eclipse.papyrus.infra.core.papyrusEditor">

-            </equals>

-         </with>

-      </activeWhen>

-   </handler>

-</extension>

-<extension

-      point="org.eclipse.ui.menus">

-   <menuContribution

-         allPopups="false"

-         locationURI="toolbar:org.eclipes.papyrus.menu.toolbar">

-      <command

-            commandId="org.eclipse.ui.file.refresh"

-            icon="icons/refresh.gif"

-            label="Refresh"

-            style="push"

-            tooltip="Refresh the current diagram">

-         <visibleWhen

-               checkEnabled="false">

-            <with

-                  variable="activeEditorId">

-               <equals

-                     value="org.eclipse.papyrus.infra.core.papyrusEditor">

-               </equals>

-            </with>

-         </visibleWhen>

-      </command>

-   </menuContribution>

-</extension>

-<extension

-      point="org.eclipse.ui.preferencePages">

-   <page

-         category="org.eclipse.papyrus.infra.core.sasheditor.preferences.generalcategory"

-         class="org.eclipse.papyrus.infra.gmfdiag.common.preferences.ConnectionToolPreferencePage"

-         id="org.eclipse.papyrus.infra.gmfdiag.common.connectionTools"

-         name="Connection Tools">

-   </page>

-</extension>

-<extension

-      point="org.eclipse.core.runtime.preferences">

-   <initializer

-         class="org.eclipse.papyrus.infra.gmfdiag.common.preferences.ConnectionToolPreferenceInitializer">

-   </initializer>

-</extension>

-   <extension

-         point="org.eclipse.papyrus.infra.core.model">

-      <model

-            classname="org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel"

-            description="Model for notation">

-      </model>

-  </extension>

-

-

-   <extension

-         point="org.eclipse.emf.ecore.extension_parser">

-      <parser

-            class="org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory"

-            type="notation">

-      </parser>

-   </extension>

-<extension

-         point="org.eclipse.papyrus.infra.core.service">

-      <serviceFactory

-            classname="org.eclipse.papyrus.infra.gmfdiag.common.undocontext.UndoContextServiceFactory"

-            description="The shared IUndoContext used to tag command in the CommandStack"

-            id="org.eclipse.core.commands.operations.IUndoContext"

-            priority="1"

-            startKind="lazy">

-         <dependsOn

-               serviceKeyRef="org.eclipse.emf.transaction.TransactionalEditingDomain">

-         </dependsOn>

-      </serviceFactory>

-      <service

-            classname="org.eclipse.papyrus.infra.gmfdiag.common.DefaultGraphicalEditorSupport"

-            description="The default diagram editor support implementation."

-            id="org.eclipse.papyrus.infra.gmfdiag.common.IGraphicalEditorSupport"

-            priority="1"

-            startKind="lazy">

-      </service>

-   </extension>

-<extension

-      point="org.eclipse.papyrus.infra.services.labelprovider.labelProvider">

-   <labelProvider

-         priority="40"

-         provider="org.eclipse.papyrus.infra.gmfdiag.common.providers.NotationFilteredLabelProvider">

-   </labelProvider>

-</extension>

-<extension

-      point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">

-   <decoratorProvider

-         class="org.eclipse.papyrus.infra.gmfdiag.common.providers.ShapeDecoratorProvider">

-      <Priority

-            name="Lowest">

-      </Priority>

-   </decoratorProvider>

-</extension>

-<extension

-      point="org.eclipse.core.runtime.adapters">

-   <factory

-         adaptableType="org.eclipse.gmf.runtime.notation.Diagram"

-         class="org.eclipse.papyrus.infra.gmfdiag.common.adapter.DiagramAdapterFactory">

-      <adapter

-            type="org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IOpenable">

-      </adapter>

-   </factory>

-</extension>

-

-<!-- ElementType bindings for diagram duplication with paste command -->

- <extension

-         point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">

-      <metamodel

-            nsURI="http://www.eclipse.org/emf/2002/Ecore">

-         <adviceBinding

-               class="org.eclipse.papyrus.infra.gmfdiag.common.advice.GMFDiagramDuplicateEditHelperAdvice"

-               id="org.eclipse.papyrus.infra.gmfdiag.common.advice.GMFDiagramDuplicateEditHelperAdvice"

-               inheritance="none"

-               typeId="*">

-         </adviceBinding>

-      </metamodel>

-   </extension>

-   

-<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">

-

-	<!-- Bindings declaration -->

-	<binding context="org.eclipse.papyrus.infra.services.edit.TypeContext">

-		<advice ref="org.eclipse.papyrus.infra.gmfdiag.common.advice.GMFDiagramDuplicateEditHelperAdvice" />

-	</binding>

-</extension>

-<extension

-      point="org.eclipse.core.expressions.propertyTesters">

-   <propertyTester

-         class="org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramPropertyTester"

-         id="org.eclipse.papyrus.infra.gmfdiag.common.diagram.tester"

-         namespace="org.eclipse.papyrus.infra.gmfdiag.common.diagram.tester"

-         properties="isDiagramEditor"

-         type="org.eclipse.jface.viewers.IStructuredSelection">

-   </propertyTester>

-   <propertyTester

-         class="org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramPropertyTester"

-         id="org.eclipse.papyrus.infra.gmfdiag.common.diagram.context.tester"

-         namespace="org.eclipse.papyrus.infra.gmfdiag.common.diagram.context.tester"

-         properties="isGmfDiagramContextActive"

-         type="java.util.Collection">

+<plugin>
+   <extension-point id="nestedEditor" name="NestedEditor" schema="schema/nestedEditor.exsd"/>
+   <extension-point id="initializeView" name="initializeView" schema="schema/initializeView.exsd"/>
+   <extension-point id="shapeProvider" name="ShapeProvider" schema="schema/shapeProvider.exsd"/>
+   <extension-point id="notationTypesMapping" name="notationTypesMapping" schema="schema/notationTypesMapping.exsd"/>
+   <extension-point id="svgPostProcessors" name="svgPostProcessors" schema="schema/svgPostProcessors.exsd"/>
+   <extension-point id="pasteCommandProvider" name="pasteCommandProvider" schema="schema/pasteCommandProvider.exsd"/>
+
+<extension
+      point="org.eclipse.ui.handlers">
+   <handler
+         class="org.eclipse.papyrus.infra.gmfdiag.common.handler.RefreshHandler"
+         commandId="org.eclipse.ui.file.refresh">
+      <activeWhen>
+         <with
+               variable="activePartId">
+            <equals
+                  value="org.eclipse.papyrus.infra.core.papyrusEditor">
+            </equals>
+         </with>
+      </activeWhen>
+   </handler>
+</extension>
+<extension
+      point="org.eclipse.ui.menus">
+   <menuContribution
+         allPopups="false"
+         locationURI="toolbar:org.eclipes.papyrus.menu.toolbar">
+      <command
+            commandId="org.eclipse.ui.file.refresh"
+            icon="icons/refresh.gif"
+            label="Refresh"
+            style="push"
+            tooltip="Refresh the current diagram">
+         <visibleWhen
+               checkEnabled="false">
+            <with
+                  variable="activeEditorId">
+               <equals
+                     value="org.eclipse.papyrus.infra.core.papyrusEditor">
+               </equals>
+            </with>
+         </visibleWhen>
+      </command>
+   </menuContribution>
+</extension>
+<extension
+      point="org.eclipse.ui.preferencePages">
+   <page
+         category="org.eclipse.papyrus.infra.core.sasheditor.preferences.generalcategory"
+         class="org.eclipse.papyrus.infra.gmfdiag.common.preferences.ConnectionToolPreferencePage"
+         id="org.eclipse.papyrus.infra.gmfdiag.common.connectionTools"
+         name="Connection Tools">
+   </page>
+</extension>
+<extension
+      point="org.eclipse.core.runtime.preferences">
+   <initializer
+         class="org.eclipse.papyrus.infra.gmfdiag.common.preferences.ConnectionToolPreferenceInitializer">
+   </initializer>
+</extension>
+   <extension
+         point="org.eclipse.papyrus.infra.core.model">
+      <model
+            classname="org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel"
+            description="Model for notation">
+      </model>
+  </extension>
+
+
+   <extension
+         point="org.eclipse.emf.ecore.extension_parser">
+      <parser
+            class="org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory"
+            type="notation">
+      </parser>
+   </extension>
+<extension
+         point="org.eclipse.papyrus.infra.core.service">
+      <serviceFactory
+            classname="org.eclipse.papyrus.infra.gmfdiag.common.undocontext.UndoContextServiceFactory"
+            description="The shared IUndoContext used to tag command in the CommandStack"
+            id="org.eclipse.core.commands.operations.IUndoContext"
+            priority="1"
+            startKind="lazy">
+         <dependsOn
+               serviceKeyRef="org.eclipse.emf.transaction.TransactionalEditingDomain">
+         </dependsOn>
+      </serviceFactory>
+      <service
+            classname="org.eclipse.papyrus.infra.gmfdiag.common.DefaultGraphicalEditorSupport"
+            description="The default diagram editor support implementation."
+            id="org.eclipse.papyrus.infra.gmfdiag.common.IGraphicalEditorSupport"
+            priority="1"
+            startKind="lazy">
+      </service>
+   </extension>
+<extension
+      point="org.eclipse.papyrus.infra.services.labelprovider.labelProvider">
+   <labelProvider
+         priority="40"
+         provider="org.eclipse.papyrus.infra.gmfdiag.common.providers.NotationFilteredLabelProvider">
+   </labelProvider>
+</extension>
+<extension
+      point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">
+   <decoratorProvider
+         class="org.eclipse.papyrus.infra.gmfdiag.common.providers.ShapeDecoratorProvider">
+      <Priority
+            name="Lowest">
+      </Priority>
+   </decoratorProvider>
+</extension>
+<extension
+      point="org.eclipse.core.runtime.adapters">
+   <factory
+         adaptableType="org.eclipse.gmf.runtime.notation.Diagram"
+         class="org.eclipse.papyrus.infra.gmfdiag.common.adapter.DiagramAdapterFactory">
+      <adapter
+            type="org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IOpenable">
+      </adapter>
+   </factory>
+</extension>
+
+<!-- ElementType bindings for diagram duplication with paste command -->
+ <extension
+         point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
+      <metamodel
+            nsURI="http://www.eclipse.org/emf/2002/Ecore">
+         <adviceBinding
+               class="org.eclipse.papyrus.infra.gmfdiag.common.advice.GMFDiagramDuplicateEditHelperAdvice"
+               id="org.eclipse.papyrus.infra.gmfdiag.common.advice.GMFDiagramDuplicateEditHelperAdvice"
+               inheritance="none"
+               typeId="*">
+         </adviceBinding>
+      </metamodel>
+   </extension>
+   
+<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">
+
+	<!-- Bindings declaration -->
+	<binding context="org.eclipse.papyrus.infra.services.edit.TypeContext">
+		<advice ref="org.eclipse.papyrus.infra.gmfdiag.common.advice.GMFDiagramDuplicateEditHelperAdvice" />
+	</binding>
+</extension>
+<extension
+      point="org.eclipse.core.expressions.propertyTesters">
+   <propertyTester
+         class="org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramPropertyTester"
+         id="org.eclipse.papyrus.infra.gmfdiag.common.diagram.tester"
+         namespace="org.eclipse.papyrus.infra.gmfdiag.common.diagram.tester"
+         properties="isDiagramEditor"
+         type="org.eclipse.jface.viewers.IStructuredSelection">
    </propertyTester>
-</extension>

-<extension

-      point="org.eclipse.papyrus.infra.gmfdiag.common.shapeProvider">

-   <shapeProvider

-         class="org.eclipse.papyrus.infra.gmfdiag.common.providers.StyleBasedShapeProvider"

-         description="Provides shapes based on the applied styles."

-         id="org.eclipse.papyrus.infra.gmfdiag.common.providers.StyleBasedShapeProvider"

-         name="StyleBasedShapeProvider">

-      <Priority

-            name="Low"></Priority>

-   </shapeProvider>

-</extension>

+   <propertyTester
+         class="org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramPropertyTester"
+         id="org.eclipse.papyrus.infra.gmfdiag.common.diagram.context.tester"
+         namespace="org.eclipse.papyrus.infra.gmfdiag.common.diagram.context.tester"
+         properties="isGmfDiagramContextActive"
+         type="java.util.Collection">
+   </propertyTester>
+</extension>
+<extension
+      point="org.eclipse.papyrus.infra.gmfdiag.common.shapeProvider">
+   <shapeProvider
+         class="org.eclipse.papyrus.infra.gmfdiag.common.providers.StyleBasedShapeProvider"
+         description="Provides shapes based on the applied styles."
+         id="org.eclipse.papyrus.infra.gmfdiag.common.providers.StyleBasedShapeProvider"
+         name="StyleBasedShapeProvider">
+      <Priority
+            name="Low"></Priority>
+   </shapeProvider>
+</extension>
 <extension

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

    <mapping

@@ -180,4 +181,4 @@
          type="compartment_shape_display">

    </mapping>

 </extension>

-</plugin>

+</plugin>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.pastemanager/schema/pasteCommandProvider.exsd b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/schema/pasteCommandProvider.exsd
index 3a26f742600..828559605ee 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.pastemanager/schema/pasteCommandProvider.exsd
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/schema/pasteCommandProvider.exsd
@@ -1,150 +1,150 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.uml.pastemanager" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appinfo>

-         <meta.schema plugin="org.eclipse.papyrus.uml.pastemanager" id="pasteCommandProvider" name="pasteCommandProvider"/>

-      </appinfo>

-      <documentation>

-         this extension point is used to declare a class that can provide command in charge of the paste

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appinfo>

-            <meta.element />

-         </appinfo>

-      </annotation>

-      <complexType>

-         <sequence>

-            <element ref="PasteCommandProvider"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute translatable="true"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="PasteCommandProvider">

-      <annotation>

-         <documentation>

-            a paste provider has  to provide an operation in order to paste by taking account system clipboard or papyrus clipboard

-         </documentation>

-      </annotation>

-      <complexType>

-         <attribute name="realization" type="string" use="required">

-            <annotation>

-               <documentation>

-                  this is the class that will provide the command in charge of the paste

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.uml.pastemanager.IPasteCommandProvider"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-         <attribute name="priority" use="required">

-            <annotation>

-               <documentation>

-                  this the priority of the associated pasteCommandProvider

-The priority of the provider. It can be one of the following values:

-[Lowest, Low, Medium, High, Highest].

-               </documentation>

-            </annotation>

-            <simpleType>

-               <restriction base="string">

-                  <enumeration value="Lowest">

-                  </enumeration>

-                  <enumeration value="Low">

-                  </enumeration>

-                  <enumeration value="Medium">

-                  </enumeration>

-                  <enumeration value="High">

-                  </enumeration>

-                  <enumeration value="Highest">

-                  </enumeration>

-               </restriction>

-            </simpleType>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="since"/>

-      </appinfo>

-      <documentation>

-         0.7.0

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="examples"/>

-      </appinfo>

-      <documentation>

-         [Enter extension point usage example here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="apiinfo"/>

-      </appinfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="implementation"/>

-      </appinfo>

-      <documentation>

-         [Enter information about supplied implementation of this extension point.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="copyright"/>

-      </appinfo>

-      <documentation>

-         /*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-      </documentation>

-   </annotation>

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.gmfdiag.common" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.gmfdiag.common" id="pasteCommandProvider" name="pasteCommandProvider"/>
+      </appInfo>
+      <documentation>
+         this extension point is used to declare a class that can provide command in charge of the paste
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="PasteCommandProvider"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute translatable="true"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="PasteCommandProvider">
+      <annotation>
+         <documentation>
+            a paste provider has  to provide an operation in order to paste by taking account system clipboard or papyrus clipboard
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="realization" type="string" use="required">
+            <annotation>
+               <documentation>
+                  this is the class that will provide the command in charge of the paste
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.uml.pastemanager.IPasteCommandProvider"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+         <attribute name="priority" use="required">
+            <annotation>
+               <documentation>
+                  this the priority of the associated pasteCommandProvider
+The priority of the provider. It can be one of the following values:
+[Lowest, Low, Medium, High, Highest].
+               </documentation>
+            </annotation>
+            <simpleType>
+               <restriction base="string">
+                  <enumeration value="Lowest">
+                  </enumeration>
+                  <enumeration value="Low">
+                  </enumeration>
+                  <enumeration value="Medium">
+                  </enumeration>
+                  <enumeration value="High">
+                  </enumeration>
+                  <enumeration value="Highest">
+                  </enumeration>
+               </restriction>
+            </simpleType>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         0.7.0
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiinfo"/>
+      </appInfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="copyright"/>
+      </appInfo>
+      <documentation>
+         /*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.pastemanager/src/org/eclipse/papyrus/uml/pastemanager/request/PasteRequest.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/requests/PasteRequest.java
index 524acab672e..3fd7cc87295 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.pastemanager/src/org/eclipse/papyrus/uml/pastemanager/request/PasteRequest.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/requests/PasteRequest.java
@@ -1,59 +1,74 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.pastemanager.request;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashMap;

-

-import org.eclipse.gef.Request;

-import org.eclipse.gmf.runtime.diagram.ui.requests.DuplicateRequest;

-

-/**

- * this a specific paste request in the framework of papyrus

- *

- */

-public class PasteRequest extends Request {

-	

-	public final static String REQ_PAPYRUS_PASTE="Papyrus_PASTE";

-	

-	/**

-	 * @param elementToPaste the elementToPaste to set

-	 */

-	public void setElementToPaste(Collection elementToPaste) {

-		this.elementToPaste = elementToPaste;

-	}

-

-	/**

-	 * @return the elementToPaste

-	 */

-	public Collection getElementToPaste() {

-		return elementToPaste;

-	}

-

-	protected Collection elementToPaste;

-	

-	public PasteRequest(Collection elementToPaste){

-		this.elementToPaste=elementToPaste;

-		this.setType(REQ_PAPYRUS_PASTE);

-		

-	}

-	public DuplicateRequest getDuplicate(){

-		DuplicateRequest duplicateRequest= new DuplicateRequest();

-		duplicateRequest.setEditParts(new ArrayList());

-		duplicateRequest.setExtendedData(new HashMap());

-		return duplicateRequest;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.gmfdiag.common.commands.requests;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+
+import org.eclipse.gef.Request;
+import org.eclipse.gmf.runtime.diagram.ui.requests.DuplicateRequest;
+
+/**
+ * This is a specific paste request in the framework of papyrus.
+ */
+public class PasteRequest extends Request {
+	
+	/** The Constant REQ_PAPYRUS_PASTE. */
+	public final static String REQ_PAPYRUS_PASTE="Papyrus_PASTE"; //$NON-NLS-1$
+	
+	/** The element to paste. */
+	protected Collection elementToPaste;
+	
+	/**
+	 * Instantiates a new paste request.
+	 *
+	 * @param elementToPaste the element to paste
+	 */
+	public PasteRequest(Collection elementToPaste){
+		this.elementToPaste=elementToPaste;
+		this.setType(REQ_PAPYRUS_PASTE);
+	}
+	
+	/**
+	 * Sets the element to paste.
+	 *
+	 * @param elementToPaste the elementToPaste to set
+	 */
+	public void setElementToPaste(Collection elementToPaste) {
+		this.elementToPaste = elementToPaste;
+	}
+
+	/**
+	 * Gets the element to paste.
+	 *
+	 * @return the elementToPaste
+	 */
+	public Collection getElementToPaste() {
+		return elementToPaste;
+	}
+
+	/**
+	 * Gets the duplicate.
+	 *
+	 * @return the duplicate
+	 */
+	public DuplicateRequest getDuplicate(){
+		DuplicateRequest duplicateRequest= new DuplicateRequest();
+		duplicateRequest.setEditParts(new ArrayList());
+		duplicateRequest.setExtendedData(new HashMap());
+		return duplicateRequest;
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/plugin.xml
index 76f118827e0..60cae741b48 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/plugin.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/plugin.xml
@@ -1,139 +1,157 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

-         point="org.eclipse.ui.menus">

-      <menuContribution

-            locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu?after=filtersMenu">

-         <menu

-               icon="icons/papyrus.png"

-               id="org.eclipse.papyrus.infra.gmfdiag.menu.editmenu"

-               label="Edit">

-            <command

-                  commandId="org.eclipse.ui.edit.undo"

-                  style="push">

-            </command>

-            <command

-                  commandId="org.eclipse.ui.edit.redo"

-                  style="push">

-            </command>

-            <separator

-                  name="undo_redo_separator"

-                  visible="true">

-            </separator>

-            <command

-                  commandId="org.eclipse.ui.edit.cut"

-                  style="push">

-            </command>

-            <command

-                  commandId="org.eclipse.ui.edit.copy"

-                  style="push">

-            </command>

-            <command

-                  commandId="org.eclipse.ui.edit.paste"

-                  style="push">

-            </command>

-            <separator

-                  name="edit_actions_separator"

-                  visible="true">

-            </separator>

-            <command

-                  commandId="org.eclipse.papyrus.infra.gmfdiag.menu.selectelementswithsametype"

-                  style="push">

-            </command>

-         </menu>

-      </menuContribution>

-   </extension>

-   <extension

-         point="org.eclipse.ui.handlers">

-      <handler

-            class="org.eclipse.papyrus.infra.gmfdiag.menu.handlers.CutInDiagramHandler"

-            commandId="org.eclipse.ui.edit.cut">

-         <activeWhen>

-            <and>

-               <with

-                     variable="activeContexts">

-                  <test

-                        property="org.eclipse.papyrus.infra.gmfdiag.common.diagram.context.tester.isGmfDiagramContextActive"

-                        value="true">

-                  </test>

-               </with>

-               <with

-                     variable="selection">

-                  <test

-                        forcePluginActivation="true"

-                        property="org.eclipse.papyrus.infra.gmfdiag.common.diagram.tester.isDiagramEditor"

-                        value="true">

-                  </test>

-               </with>

-            </and>

-         </activeWhen>

-      </handler>

-      <handler

-            class="org.eclipse.papyrus.infra.gmfdiag.menu.handlers.CopyInDiagramHandler"

-            commandId="org.eclipse.ui.edit.copy">

-         <activeWhen>

-            <and>

-               <with

-                     variable="activeContexts">

-                  <test

-                        property="org.eclipse.papyrus.infra.gmfdiag.common.diagram.context.tester.isGmfDiagramContextActive"

-                        value="true">

-                  </test>

-               </with>

-               <with

-                     variable="selection">

-                  <test

-                        forcePluginActivation="true"

-                        property="org.eclipse.papyrus.infra.gmfdiag.common.diagram.tester.isDiagramEditor"

-                        value="true">

-                  </test>

-               </with>

-            </and>

-         </activeWhen>

-      </handler>

-      <handler

-            class="org.eclipse.papyrus.infra.gmfdiag.menu.handlers.PasteInDiagramHandler"

-            commandId="org.eclipse.ui.edit.paste">

-         <activeWhen>

-            <and>

-               <with

-                     variable="activeContexts">

-                  <test

-                        property="org.eclipse.papyrus.infra.gmfdiag.common.diagram.context.tester.isGmfDiagramContextActive"

-                        value="true">

-                  </test>

-               </with>

-               <with

-                     variable="selection">

-                  <test

-                        forcePluginActivation="true"

-                        property="org.eclipse.papyrus.infra.gmfdiag.common.diagram.tester.isDiagramEditor"

-                        value="true">

-                  </test>

-               </with>

-            </and>

-         </activeWhen>

-      </handler>

-   </extension>

-   <extension

-         point="org.eclipse.ui.commands">

-      <command

-            categoryId="org.eclipse.papyrus.editor.category"

-            defaultHandler="org.eclipse.papyrus.infra.gmfdiag.menu.handlers.SelectElementWithTheSameTypeHandler"

-            description="Select the elements in the current diagram which have the same type"

-            id="org.eclipse.papyrus.infra.gmfdiag.menu.selectelementswithsametype"

-            name="Select Elements With Same Type">

-      </command>

-   </extension>

-   <extension

-         point="org.eclipse.ui.bindings">

-      <key

-            commandId="org.eclipse.papyrus.infra.gmfdiag.menu.selectelementswithsametype"

-            contextId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"

-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"

-            sequence="M1+M3+A">

-      </key>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu?after=filtersMenu">
+         <menu
+               icon="icons/papyrus.png"
+               id="org.eclipse.papyrus.infra.gmfdiag.menu.editmenu"
+               label="Edit">
+            <command
+                  commandId="org.eclipse.ui.edit.undo"
+                  style="push">
+            </command>
+            <command
+                  commandId="org.eclipse.ui.edit.redo"
+                  style="push">
+            </command>
+            <separator
+                  name="undo_redo_separator"
+                  visible="true">
+            </separator>
+            <command
+                  commandId="org.eclipse.ui.edit.cut"
+                  style="push">
+            </command>
+            <command
+                  commandId="org.eclipse.ui.edit.copy"
+                  style="push">
+            </command>
+            <command
+                  commandId="org.eclipse.ui.edit.paste"
+                  style="push">
+            </command>
+            <separator
+                  name="edit_actions_separator"
+                  visible="true">
+            </separator>
+            <command
+                  commandId="org.eclipse.papyrus.infra.gmfdiag.menu.selectelementswithsametype"
+                  style="push">
+            </command>
+         </menu>
+      </menuContribution>
+   </extension>
+   <extension
+         point="org.eclipse.ui.handlers">
+      <handler
+            class="org.eclipse.papyrus.infra.gmfdiag.menu.handlers.CutInDiagramHandler"
+            commandId="org.eclipse.ui.edit.cut">
+         <activeWhen>
+            <and>
+               <with
+                     variable="activeContexts">
+                  <test
+                        property="org.eclipse.papyrus.infra.gmfdiag.common.diagram.context.tester.isGmfDiagramContextActive"
+                        value="true">
+                  </test>
+               </with>
+               <with
+                     variable="selection">
+                  <test
+                        forcePluginActivation="true"
+                        property="org.eclipse.papyrus.infra.gmfdiag.common.diagram.tester.isDiagramEditor"
+                        value="true">
+                  </test>
+               </with>
+            </and>
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.eclipse.papyrus.infra.gmfdiag.menu.handlers.CopyInDiagramHandler"
+            commandId="org.eclipse.ui.edit.copy">
+         <activeWhen>
+            <and>
+               <with
+                     variable="activeContexts">
+                  <test
+                        property="org.eclipse.papyrus.infra.gmfdiag.common.diagram.context.tester.isGmfDiagramContextActive"
+                        value="true">
+                  </test>
+               </with>
+               <with
+                     variable="selection">
+                  <test
+                        forcePluginActivation="true"
+                        property="org.eclipse.papyrus.infra.gmfdiag.common.diagram.tester.isDiagramEditor"
+                        value="true">
+                  </test>
+               </with>
+            </and>
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.eclipse.papyrus.infra.gmfdiag.menu.handlers.PasteInDiagramHandler"
+            commandId="org.eclipse.ui.edit.paste">
+         <activeWhen>
+            <and>
+               <with
+                     variable="activeContexts">
+                  <test
+                        property="org.eclipse.papyrus.infra.gmfdiag.common.diagram.context.tester.isGmfDiagramContextActive"
+                        value="true">
+                  </test>
+               </with>
+               <with
+                     variable="selection">
+                  <test
+                        forcePluginActivation="true"
+                        property="org.eclipse.papyrus.infra.gmfdiag.common.diagram.tester.isDiagramEditor"
+                        value="true">
+                  </test>
+               </with>
+            </and>
+         </activeWhen>
+      </handler>
+   </extension>
+   <extension
+         point="org.eclipse.ui.commands">
+      <command
+            categoryId="org.eclipse.papyrus.editor.category"
+            defaultHandler="org.eclipse.papyrus.infra.gmfdiag.menu.handlers.SelectElementWithTheSameTypeHandler"
+            description="Select the elements in the current diagram which have the same type"
+            id="org.eclipse.papyrus.infra.gmfdiag.menu.selectelementswithsametype"
+            name="Select Elements With Same Type">
+      </command>
+   </extension>
+   <extension
+         point="org.eclipse.ui.bindings">
+      <key
+            commandId="org.eclipse.papyrus.infra.gmfdiag.menu.selectelementswithsametype"
+            contextId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+            sequence="M1+M3+A">
+      </key>
+      <key
+            commandId="org.eclipse.ui.edit.copy"
+            contextId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+            sequence="M1+M2+C">
+      </key>
+      <key
+            commandId="org.eclipse.ui.edit.cut"
+            contextId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+            sequence="M1+M2+X">
+      </key>
+      <key
+            commandId="org.eclipse.ui.edit.paste"
+            contextId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+            sequence="M1+M2+V">
+      </key>
+   </extension>
+
+</plugin>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF
index 1fbe843a56b..f0a1e8be392 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF
@@ -1,76 +1,75 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.0",

- org.eclipse.emf;bundle-version="2.6.0",

- org.eclipse.uml2.uml;bundle-version="3.1.0",

- org.eclipse.papyrus.sysml;bundle-version="1.0.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.0",

- org.eclipse.core.expressions,

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.0",

- org.eclipse.papyrus.editor;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.0",

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.0",

- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.0",

- org.eclipse.papyrus.sysml.service.types;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0",

- org.eclipse.papyrus.uml.modelexplorer.widgets;bundle-version="1.0.0",

- org.eclipse.draw2d;bundle-version="3.7.1",

- org.eclipse.gmf.runtime.diagram.core;bundle-version="1.4.1",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.0",

- org.eclipse.papyrus.uml.pastemanager;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0",

- org.eclipse.uml2.common.edit;bundle-version="1.6.0",

- org.eclipse.uml2.uml.edit;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",

- org.eclipse.emf.edit.ui;bundle-version="2.8.0",

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

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",

- org.eclipse.gmf.tooling.runtime;bundle-version="3.1.0",

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.core;bundle-version="1.0.0",
+ org.eclipse.emf;bundle-version="2.6.0",
+ org.eclipse.uml2.uml;bundle-version="3.1.0",
+ org.eclipse.papyrus.sysml;bundle-version="1.0.0",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.0",
+ org.eclipse.core.expressions,
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.0",
+ org.eclipse.papyrus.editor;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.0",
+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.0",
+ org.eclipse.papyrus.uml.service.types;bundle-version="1.0.0",
+ org.eclipse.papyrus.sysml.service.types;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0",
+ org.eclipse.papyrus.uml.modelexplorer.widgets;bundle-version="1.0.0",
+ org.eclipse.draw2d;bundle-version="3.7.1",
+ org.eclipse.gmf.runtime.diagram.core;bundle-version="1.4.1",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
+ org.eclipse.papyrus.uml.tools;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0",
+ org.eclipse.uml2.common.edit;bundle-version="1.6.0",
+ org.eclipse.uml2.uml.edit;bundle-version="4.0.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",
+ org.eclipse.emf.edit.ui;bundle-version="2.8.0",
+ org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.2.0",
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",
+ org.eclipse.gmf.tooling.runtime;bundle-version="3.1.0",
  org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.tools;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.0"

-Export-Package: org.eclipse.papyrus.gmf.diagram.common.commands,

- org.eclipse.papyrus.gmf.diagram.common.compatibility,

- org.eclipse.papyrus.gmf.diagram.common.edit.part,

- org.eclipse.papyrus.gmf.diagram.common.edit.policy,

- org.eclipse.papyrus.gmf.diagram.common.factory,

- org.eclipse.papyrus.gmf.diagram.common.figure,

- org.eclipse.papyrus.gmf.diagram.common.locator,

- org.eclipse.papyrus.gmf.diagram.common.parser,

- org.eclipse.papyrus.gmf.diagram.common.provider,

- org.eclipse.papyrus.sysml.diagram.common,

- org.eclipse.papyrus.sysml.diagram.common.commands,

- org.eclipse.papyrus.sysml.diagram.common.dialogs,

- org.eclipse.papyrus.sysml.diagram.common.edit.part,

- org.eclipse.papyrus.sysml.diagram.common.edit.policy,

- org.eclipse.papyrus.sysml.diagram.common.factory,

- org.eclipse.papyrus.sysml.diagram.common.figure,

- org.eclipse.papyrus.sysml.diagram.common.messages,

- org.eclipse.papyrus.sysml.diagram.common.parser,

- org.eclipse.papyrus.sysml.diagram.common.preferences,

- org.eclipse.papyrus.sysml.diagram.common.utils,

- org.eclipse.papyrus.uml.diagram.common.dnd.helper,

- org.eclipse.papyrus.uml.diagram.common.edit.part,

- org.eclipse.papyrus.uml.diagram.common.edit.policy,

- org.eclipse.papyrus.uml.diagram.common.factory,

- org.eclipse.papyrus.uml.diagram.common.figure,

- org.eclipse.papyrus.uml.diagram.common.parser,

- org.eclipse.papyrus.uml.diagram.common.utils

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.sysml.diagram.common.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.common;singleto

- n:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-

+Export-Package: org.eclipse.papyrus.gmf.diagram.common.commands,
+ org.eclipse.papyrus.gmf.diagram.common.compatibility,
+ org.eclipse.papyrus.gmf.diagram.common.edit.part,
+ org.eclipse.papyrus.gmf.diagram.common.edit.policy,
+ org.eclipse.papyrus.gmf.diagram.common.factory,
+ org.eclipse.papyrus.gmf.diagram.common.figure,
+ org.eclipse.papyrus.gmf.diagram.common.locator,
+ org.eclipse.papyrus.gmf.diagram.common.parser,
+ org.eclipse.papyrus.gmf.diagram.common.provider,
+ org.eclipse.papyrus.sysml.diagram.common,
+ org.eclipse.papyrus.sysml.diagram.common.commands,
+ org.eclipse.papyrus.sysml.diagram.common.dialogs,
+ org.eclipse.papyrus.sysml.diagram.common.edit.part,
+ org.eclipse.papyrus.sysml.diagram.common.edit.policy,
+ org.eclipse.papyrus.sysml.diagram.common.factory,
+ org.eclipse.papyrus.sysml.diagram.common.figure,
+ org.eclipse.papyrus.sysml.diagram.common.messages,
+ org.eclipse.papyrus.sysml.diagram.common.parser,
+ org.eclipse.papyrus.sysml.diagram.common.preferences,
+ org.eclipse.papyrus.sysml.diagram.common.utils,
+ org.eclipse.papyrus.uml.diagram.common.dnd.helper,
+ org.eclipse.papyrus.uml.diagram.common.edit.part,
+ org.eclipse.papyrus.uml.diagram.common.edit.policy,
+ org.eclipse.papyrus.uml.diagram.common.factory,
+ org.eclipse.papyrus.uml.diagram.common.figure,
+ org.eclipse.papyrus.uml.diagram.common.parser,
+ org.eclipse.papyrus.uml.diagram.common.utils
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.0.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.sysml.diagram.common.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.common;singleto
+ n:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/EnumerationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/EnumerationPreferencePage.java
index 79e281d4684..2b615ec78fb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/EnumerationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/EnumerationPreferencePage.java
@@ -29,7 +29,7 @@ public class EnumerationPreferencePage extends AbstractPapyrusNodePreferencePage
 	/**

 	 * @generated

 	 */

-	public static final String compartments[] = { "EnumerationLiteralCompartment" };

+	public static final String compartments[] = { "literals" };

 

 	/**

 	 * @generated

@@ -89,7 +89,7 @@ public class EnumerationPreferencePage extends AbstractPapyrusNodePreferencePage
 	 */

 	private static TreeMap<String, Boolean> getStaticCompartmentVisibilityPreferences() {

 		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();

-		map.put("EnumerationLiteralCompartment", Boolean.TRUE);

+		map.put("literals", Boolean.TRUE);

 		return map;

 	}

 

@@ -98,13 +98,14 @@ public class EnumerationPreferencePage extends AbstractPapyrusNodePreferencePage
 	 */

 	private static TreeMap<String, Boolean> getStaticCompartmentTitleVisibilityPreferences() {

 		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();

-		map.put("EnumerationLiteralCompartment", Boolean.FALSE);

+		map.put("literals", Boolean.FALSE);

 		return map;

 	}

 

 	/**

 	 * @generated

 	 */

+	@Override

 	protected TreeMap<String, Boolean> getCompartmentTitleVisibilityPreferences() {

 		return getStaticCompartmentTitleVisibilityPreferences();

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF
index c86e393edab..d6b4430a045 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF
@@ -1,106 +1,105 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.uml.diagram.common,

- org.eclipse.papyrus.uml.diagram.common.actions,

- org.eclipse.papyrus.uml.diagram.common.actions.handlers,

- org.eclipse.papyrus.uml.diagram.common.command.wrappers,

- org.eclipse.papyrus.uml.diagram.common.commands,

- org.eclipse.papyrus.uml.diagram.common.dialogs,

- org.eclipse.papyrus.uml.diagram.common.directedit,

- org.eclipse.papyrus.uml.diagram.common.dragtracker,

- org.eclipse.papyrus.uml.diagram.common.draw2d,

- org.eclipse.papyrus.uml.diagram.common.draw2d.anchors,

- org.eclipse.papyrus.uml.diagram.common.editparts,

- org.eclipse.papyrus.uml.diagram.common.editpolicies,

- org.eclipse.papyrus.uml.diagram.common.figure.edge,

- org.eclipse.papyrus.uml.diagram.common.figure.layout,

- org.eclipse.papyrus.uml.diagram.common.figure.node,

- org.eclipse.papyrus.uml.diagram.common.handlers,

- org.eclipse.papyrus.uml.diagram.common.helper,

- org.eclipse.papyrus.uml.diagram.common.ids,

- org.eclipse.papyrus.uml.diagram.common.layout,

- org.eclipse.papyrus.uml.diagram.common.listeners,

- org.eclipse.papyrus.uml.diagram.common.locator,

- org.eclipse.papyrus.uml.diagram.common.parser,

- org.eclipse.papyrus.uml.diagram.common.parser.assist,

- org.eclipse.papyrus.uml.diagram.common.parser.custom,

- org.eclipse.papyrus.uml.diagram.common.parser.lookup,

- org.eclipse.papyrus.uml.diagram.common.parser.packageimport,

- org.eclipse.papyrus.uml.diagram.common.parser.stereotype,

- org.eclipse.papyrus.uml.diagram.common.parser.structural,

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

- org.eclipse.papyrus.uml.diagram.common.preferences,

- org.eclipse.papyrus.uml.diagram.common.providers,

- org.eclipse.papyrus.uml.diagram.common.providers.assistant,

- org.eclipse.papyrus.uml.diagram.common.resourceupdate,

- org.eclipse.papyrus.uml.diagram.common.service,

- org.eclipse.papyrus.uml.diagram.common.service.palette,

- org.eclipse.papyrus.uml.diagram.common.sheet,

- org.eclipse.papyrus.uml.diagram.common.ui.dialogs,

- org.eclipse.papyrus.uml.diagram.common.ui.helper,

- org.eclipse.papyrus.uml.diagram.common.util,

- org.eclipse.papyrus.uml.diagram.common.util.functions,

- org.eclipse.papyrus.uml.diagram.common.util.predicates

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Created-By: 1.5.0_06-b05 (Sun Microsystems Inc.)

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.diagram.common,
+ org.eclipse.papyrus.uml.diagram.common.actions,
+ org.eclipse.papyrus.uml.diagram.common.actions.handlers,
+ org.eclipse.papyrus.uml.diagram.common.command.wrappers,
+ org.eclipse.papyrus.uml.diagram.common.commands,
+ org.eclipse.papyrus.uml.diagram.common.dialogs,
+ org.eclipse.papyrus.uml.diagram.common.directedit,
+ org.eclipse.papyrus.uml.diagram.common.dragtracker,
+ org.eclipse.papyrus.uml.diagram.common.draw2d,
+ org.eclipse.papyrus.uml.diagram.common.draw2d.anchors,
+ org.eclipse.papyrus.uml.diagram.common.editparts,
+ org.eclipse.papyrus.uml.diagram.common.editpolicies,
+ org.eclipse.papyrus.uml.diagram.common.figure.edge,
+ org.eclipse.papyrus.uml.diagram.common.figure.layout,
+ org.eclipse.papyrus.uml.diagram.common.figure.node,
+ org.eclipse.papyrus.uml.diagram.common.handlers,
+ org.eclipse.papyrus.uml.diagram.common.helper,
+ org.eclipse.papyrus.uml.diagram.common.ids,
+ org.eclipse.papyrus.uml.diagram.common.layout,
+ org.eclipse.papyrus.uml.diagram.common.listeners,
+ org.eclipse.papyrus.uml.diagram.common.locator,
+ org.eclipse.papyrus.uml.diagram.common.parser,
+ org.eclipse.papyrus.uml.diagram.common.parser.assist,
+ org.eclipse.papyrus.uml.diagram.common.parser.custom,
+ org.eclipse.papyrus.uml.diagram.common.parser.lookup,
+ org.eclipse.papyrus.uml.diagram.common.parser.packageimport,
+ org.eclipse.papyrus.uml.diagram.common.parser.stereotype,
+ org.eclipse.papyrus.uml.diagram.common.parser.structural,
+ org.eclipse.papyrus.uml.diagram.common.part,
+ org.eclipse.papyrus.uml.diagram.common.preferences,
+ org.eclipse.papyrus.uml.diagram.common.providers,
+ org.eclipse.papyrus.uml.diagram.common.providers.assistant,
+ org.eclipse.papyrus.uml.diagram.common.resourceupdate,
+ org.eclipse.papyrus.uml.diagram.common.service,
+ org.eclipse.papyrus.uml.diagram.common.service.palette,
+ org.eclipse.papyrus.uml.diagram.common.sheet,
+ org.eclipse.papyrus.uml.diagram.common.ui.dialogs,
+ org.eclipse.papyrus.uml.diagram.common.ui.helper,
+ org.eclipse.papyrus.uml.diagram.common.util,
+ org.eclipse.papyrus.uml.diagram.common.util.functions,
+ org.eclipse.papyrus.uml.diagram.common.util.predicates
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Created-By: 1.5.0_06-b05 (Sun Microsystems Inc.)
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

-Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.0.0",

- org.eclipse.gmf.runtime.diagram.ui.resources.editor,

- org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.1.0",

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.0",

- org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.0.0",

- org.eclipse.papyrus.editor;bundle-version="1.0.0",

- org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.3.0",

- org.eclipse.papyrus.uml.pastemanager;bundle-version="1.0.0",

- org.eclipse.ui,

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.0",

- org.eclipse.gmf.runtime.diagram.ui.actions,

- org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="1.4.0",

- org.eclipse.core.expressions,

- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.0.0",

- org.eclipse.papyrus.uml.diagram.navigation;bundle-version="1.0.0",

- org.eclipse.gmf.runtime.diagram.ui.printing,

- org.eclipse.gmf.runtime.diagram.ui.providers.ide,

- org.eclipse.papyrus.infra.services.decoration;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.0.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.0",

- com.google.guava;bundle-version="11.0.0",

- org.eclipse.papyrus.uml.profile;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.0",

- org.eclipse.papyrus.uml.appearance;bundle-version="1.0.0",

- org.eclipse.uml2.uml.edit;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",

- org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",

- org.eclipse.jface,

- org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.0.0",

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

- org.eclipse.papyrus.infra.services.localizer;bundle-version="1.0.0",

- org.apache.batik.dom.svg;bundle-version="[1.6.0,1.7.0)",

- org.w3c.dom.svg,

- org.apache.batik.css;bundle-version="[1.6.0,1.7.0)",

- org.apache.batik.util;bundle-version="[1.6.0,1.7.0)",

- org.apache.batik.dom;bundle-version="[1.6.0,1.7.0)",

- org.eclipse.core.databinding;bundle-version="1.4.1",

- org.eclipse.gmf.tooling.runtime

-Bundle-Vendor: %providerName

-Ant-Version: Apache Ant 1.7.0

-Bundle-Version: 1.0.0.qualifier

-Eclipse-BuddyPolicy: dependent

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.common;singleton:

- =true

-

+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.0.0",
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor,
+ org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.1.0",
+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.0",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.0",
+ org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.0.0",
+ org.eclipse.papyrus.editor;bundle-version="1.0.0",
+ org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.3.0",
+ org.eclipse.ui,
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.0",
+ org.eclipse.gmf.runtime.diagram.ui.actions,
+ org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="1.4.0",
+ org.eclipse.core.expressions,
+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.0.0",
+ org.eclipse.papyrus.uml.diagram.navigation;bundle-version="1.0.0",
+ org.eclipse.gmf.runtime.diagram.ui.printing,
+ org.eclipse.gmf.runtime.diagram.ui.providers.ide,
+ org.eclipse.papyrus.infra.services.decoration;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.0.0",
+ org.eclipse.papyrus.uml.tools;bundle-version="1.0.0",
+ com.google.guava;bundle-version="11.0.0",
+ org.eclipse.papyrus.uml.profile;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.0",
+ org.eclipse.papyrus.uml.appearance;bundle-version="1.0.0",
+ org.eclipse.uml2.uml.edit;bundle-version="4.0.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",
+ org.eclipse.ui.ide;bundle-version="3.8.0",
+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",
+ org.eclipse.jface,
+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.0.0",
+ org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.4.0",
+ org.eclipse.papyrus.infra.services.localizer;bundle-version="1.0.0",
+ org.apache.batik.dom.svg;bundle-version="[1.6.0,1.7.0)",
+ org.w3c.dom.svg,
+ org.apache.batik.css;bundle-version="[1.6.0,1.7.0)",
+ org.apache.batik.util;bundle-version="[1.6.0,1.7.0)",
+ org.apache.batik.dom;bundle-version="[1.6.0,1.7.0)",
+ org.eclipse.core.databinding;bundle-version="1.4.1",
+ org.eclipse.gmf.tooling.runtime
+Bundle-Vendor: %providerName
+Ant-Version: Apache Ant 1.7.0
+Bundle-Version: 1.0.0.qualifier
+Eclipse-BuddyPolicy: dependent
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.common;singleton:
+ =true
+
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/plugin.xml
index 8e0a4c7141f..8a91ff506e4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/plugin.xml
@@ -212,10 +212,10 @@
    </aspectToolProvider>
 </extension>
 <extension
-      point="org.eclipse.papyrus.uml.pastemanager.pasteCommandProvider">
+      point="org.eclipse.papyrus.infra.gmfdiag.common.pasteCommandProvider">
    <PasteCommandProvider
          priority="Lowest"
-         realization="org.eclipse.papyrus.uml.pastemanager.service.DefaultPasteCommandProvider">
+         realization="org.eclipse.papyrus.uml.diagram.common.providers.DefaultPasteCommandProvider">
    </PasteCommandProvider>
 </extension>
 <extension
diff --git a/plugins/uml/org.eclipse.papyrus.uml.pastemanager/src/org/eclipse/papyrus/uml/pastemanager/command/CommentDropCreation.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/CommentDropCreation.java
index d9162083a94..02a5fbfce16 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.pastemanager/src/org/eclipse/papyrus/uml/pastemanager/command/CommentDropCreation.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/CommentDropCreation.java
@@ -1,98 +1,98 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.pastemanager.command;

-

-import java.util.ArrayList;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.gmf.runtime.common.core.command.AbstractCommand;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

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

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

-

-

-/**

- * this command is used to create a comment and to drop into a diagram.

- * This command is independent from diagrams

- * 

- */

-public class CommentDropCreation extends AbstractCommand {

-

-	protected String content = null;

-

-	protected Object owner = null;

-

-	protected GraphicalEditPart targetEditPart;

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param label

-	 *        label of the command

-	 * @param content

-	 *        content to put in the comment

-	 * @param owner

-	 *        the owner of the comment

-	 * @param targetEditPart

-	 *        the target editpart in which will be display the comment

-	 */

-	public CommentDropCreation(String label, String content, Object owner, GraphicalEditPart targetEditPart) {

-		super(label);

-		this.content = content;

-		this.owner = owner;

-		this.targetEditPart = targetEditPart;

-	}

-

-	@SuppressWarnings({ "rawtypes", "unchecked" })

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-		if(owner instanceof Element) {

-			//creation of the command

-			Comment comment = ((Element)owner).createOwnedComment();

-			comment.setBody(content);

-			CommandResult result = CommandResult.newOKCommandResult(comment);

-			setResult(result);

-

-			//drop the comment into the target editPart

-			DropObjectsRequest dropObjectsRequest = new DropObjectsRequest();

-			dropObjectsRequest.setLocation(new Point(10, 10));

-			ArrayList objectList = new ArrayList();

-			objectList.add(comment);

-			dropObjectsRequest.setObjects(objectList);

-			org.eclipse.gef.commands.Command cmd = targetEditPart.getCommand(dropObjectsRequest);

-			if(cmd != null) {

-				targetEditPart.getEditingDomain().getCommandStack().execute(new org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper(cmd));

-			}

-			return result;

-		}

-		return CommandResult.newOKCommandResult();

-	}

-

-	@Override

-	protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-		return null;

-	}

-

-	@Override

-	protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-		return null;

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.common.commands;
+
+import java.util.ArrayList;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.gmf.runtime.common.core.command.AbstractCommand;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
+import org.eclipse.uml2.uml.Comment;
+import org.eclipse.uml2.uml.Element;
+
+
+/**
+ * this command is used to create a comment and to drop into a diagram.
+ * This command is independent from diagrams
+ * 
+ */
+public class CommentDropCreation extends AbstractCommand {
+
+	protected String content = null;
+
+	protected Object owner = null;
+
+	protected GraphicalEditPart targetEditPart;
+
+	/**
+	 * 
+	 * Constructor.
+	 * 
+	 * @param label
+	 *        label of the command
+	 * @param content
+	 *        content to put in the comment
+	 * @param owner
+	 *        the owner of the comment
+	 * @param targetEditPart
+	 *        the target editpart in which will be display the comment
+	 */
+	public CommentDropCreation(String label, String content, Object owner, GraphicalEditPart targetEditPart) {
+		super(label);
+		this.content = content;
+		this.owner = owner;
+		this.targetEditPart = targetEditPart;
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+		if(owner instanceof Element) {
+			//creation of the command
+			Comment comment = ((Element)owner).createOwnedComment();
+			comment.setBody(content);
+			CommandResult result = CommandResult.newOKCommandResult(comment);
+			setResult(result);
+
+			//drop the comment into the target editPart
+			DropObjectsRequest dropObjectsRequest = new DropObjectsRequest();
+			dropObjectsRequest.setLocation(new Point(10, 10));
+			ArrayList objectList = new ArrayList();
+			objectList.add(comment);
+			dropObjectsRequest.setObjects(objectList);
+			org.eclipse.gef.commands.Command cmd = targetEditPart.getCommand(dropObjectsRequest);
+			if(cmd != null) {
+				targetEditPart.getEditingDomain().getCommandStack().execute(new org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper(cmd));
+			}
+			return result;
+		}
+		return CommandResult.newOKCommandResult();
+	}
+
+	@Override
+	protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+		return null;
+	}
+
+	@Override
+	protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+		return null;
+	}
+
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/DuplicateNamedElementCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/DuplicateNamedElementCommand.java
index 86e22244864..997cd07d597 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/DuplicateNamedElementCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/DuplicateNamedElementCommand.java
@@ -13,20 +13,17 @@
  *****************************************************************************/
 package org.eclipse.papyrus.uml.diagram.common.commands;
 
-import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.emf.commands.core.commands.DuplicateEObjectsCommand;
 import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;
 import org.eclipse.uml2.uml.NamedElement;
 
 /**
@@ -35,9 +32,7 @@ import org.eclipse.uml2.uml.NamedElement;
  */
 public class DuplicateNamedElementCommand extends DuplicateEObjectsCommand {
 
-	protected static final String COPY_OF = "Copy_Of_";
-
-	protected Object diagram;
+	protected Diagram diagram;
 
 	@SuppressWarnings("rawtypes")
 	public DuplicateNamedElementCommand(TransactionalEditingDomain editingDomain, String label, List eObjectsToBeDuplicated, Map allDuplicatedObjectsMap, Diagram currentDiagram) {
@@ -53,40 +48,15 @@ public class DuplicateNamedElementCommand extends DuplicateEObjectsCommand {
 	 */
 	protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
 		super.doExecuteWithResult(progressMonitor, info);
-		ArrayList<EObject> processedData= new ArrayList<EObject>();
-		Iterator iterator = getAllDuplicatedObjectsMap().values().iterator();
-		NamedElement namedElement=null;
-		while(iterator.hasNext()) {
-			Object currentObject = iterator.next();
-			if(currentObject instanceof View) {
-				if(((View)currentObject).getElement() != null && ((View)currentObject).getElement() instanceof NamedElement) {
-					namedElement = ((NamedElement)((View)currentObject).getElement());
-					if(namedElement.getName() != null && !namedElement.getName().startsWith(COPY_OF)) {
-						namedElement.setName(COPY_OF + namedElement.getName());
-					}
-				}
-				
-			}
-			
-			if(currentObject instanceof NamedElement) {
-				namedElement = ((NamedElement)currentObject);
-				// some literal has not name
-				if(namedElement.getName() != null && !namedElement.getName().startsWith(COPY_OF)) {
-					namedElement.setName(COPY_OF + namedElement.getName());
-				}
-			}
-
-		}
-		
-		 iterator = getAllDuplicatedObjectsMap().values().iterator();
-		while(iterator.hasNext()) {
-			Object currentObject = iterator.next();
-			if((currentObject instanceof EObject) &&(((EObject) currentObject).eContainer()== null)&&(((EObject) currentObject).eResource()== null))  {
-				namedElement.eResource().getContents().add((EObject)currentObject);
+		List objectsToBeDuplicated = getObjectsToBeDuplicated();
+		for (Object object : objectsToBeDuplicated) {
+			if(object instanceof NamedElement) {
+				Object duplicatedObject = getAllDuplicatedObjectsMap().get(object);
+				NamedElement namedDuplicatedObject = (NamedElement)duplicatedObject;
+				String incrementedName = NamedElementUtil.getDefaultCopyNameWithIncrement(namedDuplicatedObject,diagram.getElement().eContents());
+				namedDuplicatedObject.setName(incrementedName);
 			}
 		}
-		
 		return CommandResult.newOKCommandResult(getAllDuplicatedObjectsMap());
 	}
-	
 }
diff --git a/plugins/uml/org.eclipse.papyrus.uml.pastemanager/src/org/eclipse/papyrus/uml/pastemanager/command/PapyrusDuplicateWrapperCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/PapyrusDuplicateWrapperCommand.java
index c8a4a03a641..1a5489fbe5c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.pastemanager/src/org/eclipse/papyrus/uml/pastemanager/command/PapyrusDuplicateWrapperCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/PapyrusDuplicateWrapperCommand.java
@@ -1,219 +1,228 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.pastemanager.command;

-

-import java.util.Collections;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Map;

-import java.util.Set;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.util.FeatureMapUtil;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;

-import org.eclipse.gmf.runtime.notation.Bounds;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.LayoutConstraint;

-import org.eclipse.gmf.runtime.notation.Shape;

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

-import org.eclipse.papyrus.infra.emf.utils.BusinessModelResolver;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-

-

-/**

- * this command is used to wrap a copy command. it allows set a new owner for views.

- */

-public class PapyrusDuplicateWrapperCommand extends AbstractTransactionalCommand {

-

-	/** the new container for the shape */

-	protected View container = null;

-

-	/** Command that owns this duplicate command */

-	protected ICommand duplicateEObjectsCommandOwner = null;

-

-	/** list of object to duplicate */

-	protected List<Object> eObjectsToBeDuplicated = null;

-

-	/** Constant used as a key for the parameters map of the duplication request */

-	public static final String ADDITIONAL_DUPLICATED_ELEMENTS = "Additional_Duplicated_Elements";

-

-	/**

-	 * Constructor.

-	 * 

-	 * @param editingDomain

-	 * @param label

-	 * @param eObjectsToBeDuplicated

-	 * @param subCommand

-	 * @param container

-	 */

-	public PapyrusDuplicateWrapperCommand(TransactionalEditingDomain editingDomain, String label, List<Object> eObjectsToBeDuplicated, ICommandProxy subCommand, View container) {

-		super(editingDomain, label, null);

-		this.container = container;

-		this.eObjectsToBeDuplicated = eObjectsToBeDuplicated;

-		this.duplicateEObjectsCommandOwner = lookForDuplicateCommandOwner(subCommand);

-	}

-

-	/**

-	 * Verifies that the container of all the original objects can contain

-	 * multiple objects.

-	 */

-	@Override

-	@SuppressWarnings("rawtypes")

-	public boolean canExecute() {

-		for(Iterator iter = eObjectsToBeDuplicated.iterator(); iter.hasNext();) {

-			EObject original = (EObject)iter.next();

-			//In the case of cut the owner does not exist 

-			if(original.eContainer() == null) {

-				return true;

-

-			} else {

-				EReference reference = original.eContainmentFeature();

-				if(reference == null || !FeatureMapUtil.isMany(original.eContainer(), reference)) {

-					return false;

-				}

-			}

-		}

-		return true;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	@SuppressWarnings("rawtypes")

-	protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {

-		duplicateEObjectsCommandOwner.execute(progressMonitor, info);

-		CommandResult result = duplicateEObjectsCommandOwner.getCommandResult();

-		//reassociation to the new container

-		if(result.getReturnValue() instanceof List) {

-			Iterator resultIterator = ((List)result.getReturnValue()).iterator();

-			while(resultIterator.hasNext()) {

-				Object currentResult = resultIterator.next();

-

-				// the result of a copy is a map

-				if(currentResult instanceof Map) {

-					Map duplicatedObject = (Map)currentResult;

-					Iterator iterator = duplicatedObject.values().iterator();

-					// for each view, a container is set if it is null 

-					// if this is a shape a new position is set in order to avoid superposition

-					while(iterator.hasNext()) {

-						Object object = iterator.next();

-						if(object instanceof View) {

-							View duplicatedView = (View)object;

-							if(object instanceof Shape) {

-								LayoutConstraint layoutConstraint = ((Shape)object).getLayoutConstraint();

-								if(layoutConstraint instanceof Bounds) {

-									((Bounds)layoutConstraint).setX(((Bounds)layoutConstraint).getX() + 10);

-									((Bounds)layoutConstraint).setY(((Bounds)layoutConstraint).getY() + 10);

-								}

-							}

-							if(duplicatedView.eContainer() == null && container != null) {

-								ViewUtil.insertChildView(container, duplicatedView, -1, true);

-							}

-						}

-					}

-				}

-			}

-		} else if(result.getReturnValue() instanceof Map) { // perhaps not a list in case of simple ICommand, result value should be a map

-			Map duplicatedObject = (Map)result.getReturnValue();

-			Iterator iterator = duplicatedObject.values().iterator();

-			// for each view, a container is set if it is null 

-			// if this is a shape a new position is set in order to avoid superposition

-			while(iterator.hasNext()) {

-				Object object = iterator.next();

-				if(object instanceof Diagram) {

-					Diagram diagramView = (Diagram)object;

-					if(container != null && container.eResource() != null) {

-						container.eResource().getContents().add(diagramView);

-					}

-

-				} else if(object instanceof View) {

-					View duplicatedView = (View)object;

-					if(object instanceof Shape) {

-						LayoutConstraint layoutConstraint = ((Shape)object).getLayoutConstraint();

-						if(layoutConstraint instanceof Bounds) {

-							((Bounds)layoutConstraint).setX(((Bounds)layoutConstraint).getX() + 10);

-							((Bounds)layoutConstraint).setY(((Bounds)layoutConstraint).getY() + 10);

-						}

-					}

-					if(duplicatedView.eContainer() == null && container != null) {

-						ViewUtil.insertChildView(container, duplicatedView, -1, true);

-					}

-				}

-			}

-

-			ICommand externalObjectsDuplicateCommand = getExternalObjectsDuplicateCommand((Map<?, ?>)result.getReturnValue());

-			if(externalObjectsDuplicateCommand != null && externalObjectsDuplicateCommand.canExecute()) {

-				IStatus status = externalObjectsDuplicateCommand.execute(progressMonitor, info);

-				if(!status.isOK()) {

-					return CommandResult.newErrorCommandResult(status.getException());

-				}

-			}

-		}

-

-		return result;

-	}

-

-	/**

-	 * this class is used to look for the basic eobject duplicate command

-	 * 

-	 * @param command

-	 *        that contains normally the duplicated command

-	 * @return the duplicate command

-	 */

-	protected ICommand lookForDuplicateCommandOwner(ICommandProxy command) {

-		return command.getICommand();

-	}

-

-	/**

-	 * Returns the list of external objects to duplicate

-	 * 

-	 * @return the list of external objects to duplicate or an empty list if not elements are found to add.

-	 */

-	protected ICommand getExternalObjectsDuplicateCommand(Map duplicatedElementsMap) {

-		CompositeCommand result = new CompositeCommand("Duplicate External Objects");

-		Set<Object> duplicatedExternalElements = new HashSet<Object>();

-

-		for(Object o : duplicatedElementsMap.keySet()) {

-			if(o instanceof EObject) {

-				EObject object = (EObject)o;

-				DuplicateElementsRequest request = new DuplicateElementsRequest(Collections.singletonList(object));

-				request.setAllDuplicatedElementsMap(duplicatedElementsMap);

-				request.setParameter(PapyrusDuplicateWrapperCommand.ADDITIONAL_DUPLICATED_ELEMENTS, duplicatedExternalElements);

-				request.setParameter("Target_Owner", BusinessModelResolver.getInstance().getBusinessModel(container));

-				IElementEditService service = ElementEditServiceUtils.getCommandProvider(object);

-				ICommand command = service.getEditCommand(request);

-				if(command != null) {

-					result.add(command);

-				}

-			}

-		}

-

-		return (result.isEmpty()) ? null : result.reduce();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.common.commands;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.util.FeatureMapUtil;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;
+import org.eclipse.gmf.runtime.notation.Bounds;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.LayoutConstraint;
+import org.eclipse.gmf.runtime.notation.Shape;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.emf.utils.BusinessModelResolver;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+
+
+/**
+ * this command is used to wrap a copy command. it allows set a new owner for views.
+ */
+public class PapyrusDuplicateWrapperCommand extends AbstractTransactionalCommand {
+
+	
+	private static final String TARGET_OWNER = "Target_Owner"; //$NON-NLS-1$
+
+	//TODO: should be provided by a gmf plugin
+	private static final int DEFAULT_AVOID_SUPERPOSITION_Y = 10;
+
+	//TODO: should be provided by a gmf plugin
+	private static final int DEFAULT_AVOID_SUPERPOSITION_X = 10;
+
+	/** the new container for the shape */
+	protected View container = null;
+
+	/** Command that owns this duplicate command */
+	protected ICommand duplicateEObjectsCommandOwner = null;
+
+	/** list of object to duplicate */
+	protected List<Object> eObjectsToBeDuplicated = null;
+
+	/** Constant used as a key for the parameters map of the duplication request */
+	public static final String ADDITIONAL_DUPLICATED_ELEMENTS = "Additional_Duplicated_Elements"; //$NON-NLS-1$
+
+	/**
+	 * Constructor.
+	 * 
+	 * @param editingDomain
+	 * @param label
+	 * @param eObjectsToBeDuplicated
+	 * @param subCommand
+	 * @param container
+	 */
+	public PapyrusDuplicateWrapperCommand(TransactionalEditingDomain editingDomain, String label, List<Object> eObjectsToBeDuplicated, ICommandProxy subCommand, View container) {
+		super(editingDomain, label, null);
+		this.container = container;
+		this.eObjectsToBeDuplicated = eObjectsToBeDuplicated;
+		this.duplicateEObjectsCommandOwner = lookForDuplicateCommandOwner(subCommand);
+	}
+
+	/**
+	 * Verifies that the container of all the original objects can contain
+	 * multiple objects.
+	 */
+	@Override
+	@SuppressWarnings("rawtypes")
+	public boolean canExecute() {
+		for(Iterator iter = eObjectsToBeDuplicated.iterator(); iter.hasNext();) {
+			EObject original = (EObject)iter.next();
+			//In the case of cut the owner does not exist 
+			if(original.eContainer() == null) {
+				return true;
+
+			} else {
+				EReference reference = original.eContainmentFeature();
+				if(reference == null || !FeatureMapUtil.isMany(original.eContainer(), reference)) {
+					return false;
+				}
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	@SuppressWarnings("rawtypes")
+	protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
+		duplicateEObjectsCommandOwner.execute(progressMonitor, info);
+		CommandResult result = duplicateEObjectsCommandOwner.getCommandResult();
+		//reassociation to the new container
+		if(result.getReturnValue() instanceof List) {
+			Iterator resultIterator = ((List)result.getReturnValue()).iterator();
+			while(resultIterator.hasNext()) {
+				Object currentResult = resultIterator.next();
+
+				// the result of a copy is a map
+				if(currentResult instanceof Map) {
+					Map duplicatedObject = (Map)currentResult;
+					Iterator iterator = duplicatedObject.values().iterator();
+					// for each view, a container is set if it is null 
+					// if this is a shape a new position is set in order to avoid superposition
+					while(iterator.hasNext()) {
+						Object object = iterator.next();
+						if(object instanceof View) {
+							View duplicatedView = (View)object;
+							if(object instanceof Shape) {
+								LayoutConstraint layoutConstraint = ((Shape)object).getLayoutConstraint();
+								if(layoutConstraint instanceof Bounds) {
+									((Bounds)layoutConstraint).setX(((Bounds)layoutConstraint).getX() + DEFAULT_AVOID_SUPERPOSITION_X);
+									((Bounds)layoutConstraint).setY(((Bounds)layoutConstraint).getY() + DEFAULT_AVOID_SUPERPOSITION_Y);
+								}
+							}
+							if(duplicatedView.eContainer() == null && container != null) {
+								ViewUtil.insertChildView(container, duplicatedView, -1, true);
+							}
+						}
+					}
+				}
+			}
+		} else if(result.getReturnValue() instanceof Map) { // perhaps not a list in case of simple ICommand, result value should be a map
+			Map duplicatedObject = (Map)result.getReturnValue();
+			Iterator iterator = duplicatedObject.values().iterator();
+			// for each view, a container is set if it is null 
+			// if this is a shape a new position is set in order to avoid superposition
+			while(iterator.hasNext()) {
+				Object object = iterator.next();
+				if(object instanceof Diagram) {
+					Diagram diagramView = (Diagram)object;
+					if(container != null && container.eResource() != null) {
+						container.eResource().getContents().add(diagramView);
+					}
+
+				} else if(object instanceof View) {
+					View duplicatedView = (View)object;
+					if(object instanceof Shape) {
+						LayoutConstraint layoutConstraint = ((Shape)object).getLayoutConstraint();
+						if(layoutConstraint instanceof Bounds) {
+							((Bounds)layoutConstraint).setX(((Bounds)layoutConstraint).getX() + DEFAULT_AVOID_SUPERPOSITION_X);
+							((Bounds)layoutConstraint).setY(((Bounds)layoutConstraint).getY() + DEFAULT_AVOID_SUPERPOSITION_Y);
+						}
+					}
+					if(duplicatedView.eContainer() == null && container != null) {
+						ViewUtil.insertChildView(container, duplicatedView, -1, true);
+					}
+				}
+			}
+
+			ICommand externalObjectsDuplicateCommand = getExternalObjectsDuplicateCommand((Map<?, ?>)result.getReturnValue());
+			if(externalObjectsDuplicateCommand != null && externalObjectsDuplicateCommand.canExecute()) {
+				IStatus status = externalObjectsDuplicateCommand.execute(progressMonitor, info);
+				if(!status.isOK()) {
+					return CommandResult.newErrorCommandResult(status.getException());
+				}
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * this class is used to look for the basic eobject duplicate command
+	 * 
+	 * @param command
+	 *        that contains normally the duplicated command
+	 * @return the duplicate command
+	 */
+	protected ICommand lookForDuplicateCommandOwner(ICommandProxy command) {
+		return command.getICommand();
+	}
+
+	/**
+	 * Returns the list of external objects to duplicate
+	 * 
+	 * @return the list of external objects to duplicate or an empty list if not elements are found to add.
+	 */
+	protected ICommand getExternalObjectsDuplicateCommand(Map duplicatedElementsMap) {
+		CompositeCommand result = new CompositeCommand("Duplicate External Objects"); //$NON-NLS-1$
+		Set<Object> duplicatedExternalElements = new HashSet<Object>();
+
+		for(Object o : duplicatedElementsMap.keySet()) {
+			if(o instanceof EObject) {
+				EObject object = (EObject)o;
+				DuplicateElementsRequest request = new DuplicateElementsRequest(Collections.singletonList(object));
+				request.setAllDuplicatedElementsMap(duplicatedElementsMap);
+				request.setParameter(PapyrusDuplicateWrapperCommand.ADDITIONAL_DUPLICATED_ELEMENTS, duplicatedExternalElements);
+				request.setParameter(TARGET_OWNER, BusinessModelResolver.getInstance().getBusinessModel(container));
+				IElementEditService service = ElementEditServiceUtils.getCommandProvider(object);
+				ICommand command = service.getEditCommand(request);
+				if(command != null) {
+					result.add(command);
+				}
+			}
+		}
+
+		return (result.isEmpty()) ? null : result.reduce();
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/DuplicatePasteEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/DuplicatePasteEditPolicy.java
index 29b4f62a6a5..e66fa51b257 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/DuplicatePasteEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editpolicies/DuplicatePasteEditPolicy.java
@@ -46,8 +46,8 @@ import org.eclipse.gmf.runtime.emf.clipboard.core.ClipboardSupportUtil;
 import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;
 import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.commands.requests.PasteRequest;
 import org.eclipse.papyrus.uml.diagram.common.commands.PapyrusDuplicateViewsCommand;
-import org.eclipse.papyrus.uml.pastemanager.request.PasteRequest;
 import org.eclipse.uml2.uml.Element;
 
 /**
@@ -58,7 +58,7 @@ import org.eclipse.uml2.uml.Element;
 @SuppressWarnings({ "rawtypes", "restriction" })
 public class DuplicatePasteEditPolicy extends ContainerEditPolicy {
 
-	public final static String PASTE_ROLE = "PASTE_ROLE";
+	public final static String PASTE_ROLE = "PASTE_ROLE"; //$NON-NLS-1$
 
 	/**
 	 * @see org.eclipse.gef.EditPolicy#getCommand(Request)
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/handlers/PasteWithModelHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/handlers/PasteWithModelHandler.java
index 20d7dfa4bef..dc73f950d09 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/handlers/PasteWithModelHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/handlers/PasteWithModelHandler.java
@@ -26,7 +26,7 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.uml.diagram.common.helper.CleanDiagramHelper;
-import org.eclipse.papyrus.uml.pastemanager.service.PasteCommandService;
+import org.eclipse.papyrus.uml.diagram.common.service.PasteCommandService;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.handlers.HandlerUtil;
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.pastemanager/src/org/eclipse/papyrus/uml/pastemanager/service/DefaultPasteCommandProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/providers/DefaultPasteCommandProvider.java
index 5b8036d1498..7e2d67e29b5 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.pastemanager/src/org/eclipse/papyrus/uml/pastemanager/service/DefaultPasteCommandProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/providers/DefaultPasteCommandProvider.java
@@ -1,188 +1,191 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.pastemanager.service;

-

-import java.awt.Toolkit;

-import java.awt.datatransfer.Clipboard;

-import java.awt.datatransfer.DataFlavor;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Iterator;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.RootEditPart;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;

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

-import org.eclipse.papyrus.uml.pastemanager.Activator;

-import org.eclipse.papyrus.uml.pastemanager.command.CommentDropCreation;

-import org.eclipse.papyrus.uml.pastemanager.command.PapyrusDuplicateWrapperCommand;

-import org.eclipse.papyrus.uml.pastemanager.request.PasteRequest;

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

-import org.eclipse.gef.commands.Command;

-

-/**

- * this provider has the following behavior

- * when the System clipboard contains a string the papyrus clipboard has no information

- * (a copy has be done on the system). In this case, a comment is created and displayed in the diagram

- * the body contains the string from the clipboard.

- * In other case, a paste request {@link org.eclipse.papyrus.uml.pastemanager.request.PasteRequest} in send to the target editpart in order to obtain

- * the paste command ( graphically or the paste with model command

- * 

- */

-

-public class DefaultPasteCommandProvider implements IPasteCommandProvider {

-

-	/**

-	 * this method provides a command to paste by taking information from the clipboard of the system or gmf clipbaord

-	 * 

-	 * @param targetEditPart

-	 *        the target editpart where we want to paste

-	 * @param systemClipboard

-	 *        the system clipboard see {@link DataFlavor} to see how to extract information

-	 * @param papyrusCliboard

-	 *        contains the list of views to paste

-	 * @return

-	 */

-

-	public ICommand getPasteViewCommand(GraphicalEditPart targetEditPart, Clipboard systemClipboard, Collection<Object> papyrusClipboard) {

-

-		if(!System.getProperty("os.name").equals("Linux")) {

-			// examine system clipboard

-			String bufferSystem = null;

-			// long millisBefore = System.currentTimeMillis ();

-			DataFlavor[] dataFlavors = Toolkit.getDefaultToolkit().getSystemClipboard().getAvailableDataFlavors();

-			// System.out.println (">>> TEST: time spend in getAvailableDataFlavorsCall: " + (System.currentTimeMillis () - millisBefore));

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

-				try {

-					if(dataFlavors[i].isFlavorTextType() && dataFlavors[i].isMimeTypeEqual(DataFlavor.stringFlavor)) {

-						bufferSystem = Toolkit.getDefaultToolkit().getSystemClipboard().getData(dataFlavors[i]).toString();

-					}

-				} catch (Exception e) {

-					//System.err.println(e);

-				}

-			}

-			// detection of a paste command from the system

-			if(bufferSystem != null) {

-				// here, the choice is to create a comment from a string

-				// if the you want to modify it overload the method paste from System

-				return pasteFromSystem(targetEditPart, bufferSystem);

-			}

-			//else

-		}

-

-		/* Send the request to the target edit part of the paste command for the currently selected part */

-		PasteRequest pasteRequest = new PasteRequest(targetEditPart.getEditingDomain().getClipboard());

-		Command pasteCommand = targetEditPart.getCommand(pasteRequest);

-		if(pasteCommand != null) {

-			return new CommandProxy(pasteCommand);

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	/**

-	 * This method is in charge of pasting a string from the system.

-	 * If you want to add a new behavior, overload this method

-	 * 

-	 * @param targetEditPart

-	 * @param comment

-	 *        the string that comes from the system

-	 * @return the command in charge to do the modification in the system

-	 */

-	public ICommand pasteFromSystem(GraphicalEditPart targetEditPart, String comment) {

-		return new CommentDropCreation("paste", comment, targetEditPart.getNotationView().getElement(), targetEditPart);

-	}

-

-	@SuppressWarnings({ "rawtypes", "unchecked" })

-	/**

-	 * @inheritedDoc

-	 */

-	public ICommand getPasteWithModelCommand(GraphicalEditPart targetEditPart, Clipboard systemClipboard, Collection<Object> papyrusCliboard) {

-		//look in the clipboard of the system

-		String bufferSystem = null;

-		if(!System.getProperty("os.name").equals("Linux")) {

-			DataFlavor[] dataFlavors = Toolkit.getDefaultToolkit().getSystemClipboard().getAvailableDataFlavors();

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

-				try {

-					if(dataFlavors[i].isFlavorTextType() && dataFlavors[i].isMimeTypeEqual(DataFlavor.stringFlavor)) {

-

-						bufferSystem = Toolkit.getDefaultToolkit().getSystemClipboard().getData(dataFlavors[i]).toString();

-					}

-				} catch (Exception e) {

-					Activator.log.error(e);

-				}

-			}

-			//detection of a paste command from the system

-			if(bufferSystem != null) {

-				// here, the choice is to create a comment from a string

-				// if the you want to modify it overload the method paste from System

-				return pasteFromSystem(targetEditPart, bufferSystem);

-			}

-			//else

-		}

-		/* Send the request to the target edit part of the paste command for the currently selected part */

-		ArrayList objectToPaste = new ArrayList();

-		if(papyrusCliboard != null && papyrusCliboard.size() >= 1) {

-			objectToPaste.addAll(papyrusCliboard);

-			

-			

-			Iterator iterator = papyrusCliboard.iterator();

-			//in order to paste with model, semantic element has to be put in the list

-			while(iterator.hasNext()) {

-				Object object = (Object)iterator.next();

-				if(object instanceof View) {

-					objectToPaste.add(((View)object).getElement());

-					

-					ArrayList<EObject> stereotypedSelection = new ArrayList<EObject>();

-					EObject semantic =((View)object).getElement();

-					if( semantic instanceof Element){

-						stereotypedSelection.addAll(((Element)semantic).getStereotypeApplications());

-					}

-					//copy stereotype contained into

-					Iterator<EObject> iter=semantic.eAllContents();

-					while (iter.hasNext()) {

-						EObject subeObject = (EObject) iter.next();

-						if( subeObject instanceof Element){

-							stereotypedSelection.addAll(((Element)subeObject).getStereotypeApplications());

-						}

-						

-					}

-					objectToPaste.addAll(stereotypedSelection);

-				}

-

-			}

-			//creation of duplicate request to obtain the functionnality of GMF

-			DuplicateElementsRequest duplicateElementRequest = new DuplicateElementsRequest(targetEditPart.getEditingDomain(), objectToPaste);

-

-			//add the wrapper

-			RootEditPart topEditPart = targetEditPart.getRoot();

-			if(topEditPart.getChildren().get(0) instanceof DiagramEditPart) {

-

-				org.eclipse.gef.commands.Command gefCommand = ((DiagramEditPart)topEditPart.getChildren().get(0)).getCommand(new EditCommandRequestWrapper(duplicateElementRequest));

-				ICommand command = new PapyrusDuplicateWrapperCommand(targetEditPart.getEditingDomain(), "", objectToPaste, (ICommandProxy)gefCommand, (View)targetEditPart.getModel());

-				return command;

-			}

-		}

-

-		return UnexecutableCommand.INSTANCE;

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.common.providers;
+
+import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.DataFlavor;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gef.RootEditPart;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;
+import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.commands.requests.PasteRequest;
+import org.eclipse.papyrus.uml.diagram.common.commands.CommentDropCreation;
+import org.eclipse.papyrus.uml.diagram.common.commands.PapyrusDuplicateWrapperCommand;
+import org.eclipse.papyrus.uml.diagram.common.Activator;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.gef.commands.Command;
+
+/**
+ * this provider has the following behavior
+ * when the System clipboard contains a string the papyrus clipboard has no information
+ * (a copy has be done on the system). In this case, a comment is created and displayed in the diagram
+ * the body contains the string from the clipboard.
+ * In other case, a paste request {@link org.eclipse.papyrus.infra.gmfdiag.common.commands.requests.PasteRequest} in send to the target editpart in order to obtain
+ * the paste command ( graphically or the paste with model command
+ * 
+ */
+
+public class DefaultPasteCommandProvider implements IPasteCommandProvider {
+
+	private static final String LINUX = "Linux"; //$NON-NLS-1$
+	private static final String OS_NAME = "os.name"; //$NON-NLS-1$
+
+	/**
+	 * this method provides a command to paste by taking information from the clipboard of the system or gmf clipbaord
+	 * 
+	 * @param targetEditPart
+	 *        the target editpart where we want to paste
+	 * @param systemClipboard
+	 *        the system clipboard see {@link DataFlavor} to see how to extract information
+	 * @param papyrusCliboard
+	 *        contains the list of views to paste
+	 * @return
+	 */
+
+	public ICommand getPasteViewCommand(GraphicalEditPart targetEditPart, Clipboard systemClipboard, Collection<Object> papyrusClipboard) {
+
+		if(!System.getProperty(OS_NAME).equals(LINUX)) {
+			// examine system clipboard
+			String bufferSystem = null;
+			// long millisBefore = System.currentTimeMillis ();
+			DataFlavor[] dataFlavors = Toolkit.getDefaultToolkit().getSystemClipboard().getAvailableDataFlavors();
+			// System.out.println (">>> TEST: time spend in getAvailableDataFlavorsCall: " + (System.currentTimeMillis () - millisBefore));
+			for(int i = 0; i < dataFlavors.length; i++) {
+				try {
+					if(dataFlavors[i].isFlavorTextType() && dataFlavors[i].isMimeTypeEqual(DataFlavor.stringFlavor)) {
+						bufferSystem = Toolkit.getDefaultToolkit().getSystemClipboard().getData(dataFlavors[i]).toString();
+					}
+				} catch (Exception e) {
+					// TODO: Add logger
+				}
+			}
+			// detection of a paste command from the system
+			if(bufferSystem != null) {
+				// here, the choice is to create a comment from a string
+				// if the you want to modify it overload the method paste from System
+				return pasteFromSystem(targetEditPart, bufferSystem);
+			}
+			//else
+		}
+
+		/* Send the request to the target edit part of the paste command for the currently selected part */
+		PasteRequest pasteRequest = new PasteRequest(targetEditPart.getEditingDomain().getClipboard());
+		Command pasteCommand = targetEditPart.getCommand(pasteRequest);
+		if(pasteCommand != null) {
+			return new CommandProxy(pasteCommand);
+		}
+		return UnexecutableCommand.INSTANCE;
+	}
+
+	/**
+	 * This method is in charge of pasting a string from the system.
+	 * If you want to add a new behavior, overload this method
+	 * 
+	 * @param targetEditPart
+	 * @param comment
+	 *        the string that comes from the system
+	 * @return the command in charge to do the modification in the system
+	 */
+	public ICommand pasteFromSystem(GraphicalEditPart targetEditPart, String comment) {
+		return new CommentDropCreation("Paste from system", comment, targetEditPart.getNotationView().getElement(), targetEditPart); //$NON-NLS-1$
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	/**
+	 * @inheritedDoc
+	 */
+	public ICommand getPasteWithModelCommand(GraphicalEditPart targetEditPart, Clipboard systemClipboard, Collection<Object> papyrusCliboard) {
+		//look in the clipboard of the system
+		String bufferSystem = null;
+		if(!System.getProperty(OS_NAME).equals(LINUX)) {
+			DataFlavor[] dataFlavors = Toolkit.getDefaultToolkit().getSystemClipboard().getAvailableDataFlavors();
+			for(int i = 0; i < dataFlavors.length; i++) {
+				try {
+					if(dataFlavors[i].isFlavorTextType() && dataFlavors[i].isMimeTypeEqual(DataFlavor.stringFlavor)) {
+
+						bufferSystem = Toolkit.getDefaultToolkit().getSystemClipboard().getData(dataFlavors[i]).toString();
+					}
+				} catch (Exception e) {
+					Activator.log.error(e);
+				}
+			}
+			//detection of a paste command from the system
+			if(bufferSystem != null) {
+				// here, the choice is to create a comment from a string
+				// if the you want to modify it overload the method paste from System
+				return pasteFromSystem(targetEditPart, bufferSystem);
+			}
+			//else
+		}
+		/* Send the request to the target edit part of the paste command for the currently selected part */
+		ArrayList objectToPaste = new ArrayList();
+		if(papyrusCliboard != null && papyrusCliboard.size() >= 1) {
+			objectToPaste.addAll(papyrusCliboard);
+			
+			
+			Iterator iterator = papyrusCliboard.iterator();
+			//in order to paste with model, semantic element has to be put in the list
+			while(iterator.hasNext()) {
+				Object object = (Object)iterator.next();
+				if(object instanceof View) {
+					objectToPaste.add(((View)object).getElement());
+					
+					ArrayList<EObject> stereotypedSelection = new ArrayList<EObject>();
+					EObject semantic =((View)object).getElement();
+					if( semantic instanceof Element){
+						stereotypedSelection.addAll(((Element)semantic).getStereotypeApplications());
+					}
+					//copy stereotype contained into
+					Iterator<EObject> iter=semantic.eAllContents();
+					while (iter.hasNext()) {
+						EObject subeObject = (EObject) iter.next();
+						if( subeObject instanceof Element){
+							stereotypedSelection.addAll(((Element)subeObject).getStereotypeApplications());
+						}
+						
+					}
+					objectToPaste.addAll(stereotypedSelection);
+				}
+
+			}
+			//creation of duplicate request to obtain the functionnality of GMF
+			DuplicateElementsRequest duplicateElementRequest = new DuplicateElementsRequest(targetEditPart.getEditingDomain(), objectToPaste);
+
+			//add the wrapper
+			RootEditPart topEditPart = targetEditPart.getRoot();
+			if(topEditPart.getChildren().get(0) instanceof DiagramEditPart) {
+
+				org.eclipse.gef.commands.Command gefCommand = ((DiagramEditPart)topEditPart.getChildren().get(0)).getCommand(new EditCommandRequestWrapper(duplicateElementRequest));
+				ICommand command = new PapyrusDuplicateWrapperCommand(targetEditPart.getEditingDomain(), "Papyrus duplicate wrapper command", objectToPaste, (ICommandProxy)gefCommand, (View)targetEditPart.getModel()); //$NON-NLS-1$
+				return command;
+			}
+		}
+
+		return UnexecutableCommand.INSTANCE;
+	}
+
+
+}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.pastemanager/src/org/eclipse/papyrus/uml/pastemanager/service/IPasteCommandProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/providers/IPasteCommandProvider.java
index bf99ab7c372..111c52ea9ea 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.pastemanager/src/org/eclipse/papyrus/uml/pastemanager/service/IPasteCommandProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/providers/IPasteCommandProvider.java
@@ -1,54 +1,54 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.pastemanager.service;

-

-import java.awt.datatransfer.Clipboard;

-import java.util.Collection;

-

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-

-/**

- * 

- * a paste provider has provide operation in order to paste by taking account system clipboard or papyrus clipboard

- * 

- */

-public interface IPasteCommandProvider {

-

-	/**

-	 * return the paste command to execute by taking account parameter

-	 * 

-	 * @param targetEditPart

-	 *        the target where object will be paste

-	 * @param systemClipboard

-	 *        contains info form the system copy paste

-	 * @param papyrusCliboard

-	 *        the list of views to paste

-	 * @return a command

-	 */

-	public ICommand getPasteViewCommand(GraphicalEditPart targetEditPart, java.awt.datatransfer.Clipboard systemClipboard, Collection<Object> papyrusCliboard);

-

-	/**

-	 * return the paste command to execute by taking account parameter. It copy also element of the semantic model

-	 * 

-	 * @param targetEditPart

-	 *        the target where object will be paste

-	 * @param systemClipboard

-	 *        contains info form the system copy paste

-	 * @param papyrusCliboard

-	 *        the list of views to paste

-	 * @return a command

-	 */

-	public ICommand getPasteWithModelCommand(GraphicalEditPart targetEditPart, Clipboard systemClipboard, Collection<Object> papyrusCliboard);

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.common.providers;
+
+import java.awt.datatransfer.Clipboard;
+import java.util.Collection;
+
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+
+/**
+ * 
+ * a paste provider has provide operation in order to paste by taking account system clipboard or papyrus clipboard
+ * 
+ */
+public interface IPasteCommandProvider {
+
+	/**
+	 * return the paste command to execute by taking account parameter
+	 * 
+	 * @param targetEditPart
+	 *        the target where object will be paste
+	 * @param systemClipboard
+	 *        contains info form the system copy paste
+	 * @param papyrusCliboard
+	 *        the list of views to paste
+	 * @return a command
+	 */
+	public ICommand getPasteViewCommand(GraphicalEditPart targetEditPart, java.awt.datatransfer.Clipboard systemClipboard, Collection<Object> papyrusCliboard);
+
+	/**
+	 * return the paste command to execute by taking account parameter. It copy also element of the semantic model
+	 * 
+	 * @param targetEditPart
+	 *        the target where object will be paste
+	 * @param systemClipboard
+	 *        contains info form the system copy paste
+	 * @param papyrusCliboard
+	 *        the list of views to paste
+	 * @return a command
+	 */
+	public ICommand getPasteWithModelCommand(GraphicalEditPart targetEditPart, Clipboard systemClipboard, Collection<Object> papyrusCliboard);
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/providers/PapyrusDiagramGlobalActionHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/providers/PapyrusDiagramGlobalActionHandler.java
index f7544436747..ba2dc8d61f7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/providers/PapyrusDiagramGlobalActionHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/providers/PapyrusDiagramGlobalActionHandler.java
@@ -45,7 +45,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;
 import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.uml.diagram.common.helper.CleanDiagramHelper;
-import org.eclipse.papyrus.uml.pastemanager.service.PasteCommandService;
+import org.eclipse.papyrus.uml.diagram.common.service.PasteCommandService;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IWorkbenchPart;
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.pastemanager/src/org/eclipse/papyrus/uml/pastemanager/service/PasteCommandService.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/PasteCommandService.java
index 4edcb1ae0b7..b161456f8c7 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.pastemanager/src/org/eclipse/papyrus/uml/pastemanager/service/PasteCommandService.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/PasteCommandService.java
@@ -1,154 +1,155 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.pastemanager.service;

-

-import java.awt.datatransfer.Clipboard;

-import java.util.Collection;

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.papyrus.uml.pastemanager.Activator;

-import org.osgi.framework.Bundle;

-

-/**

- * this singleton looks for in extension point to find a pasteCommandProvider

- * and can provide a paste command

- */

-

-

-public class PasteCommandService {

-

-	protected static final String PASTECOMMANDPROVIDER_EXTENSION_ID = "org.eclipse.papyrus.uml.pastemanager.pasteCommandProvider";

-

-	protected static final String REALIZATION = "realization";

-

-	protected static final String PRIORITY = "priority";

-

-	protected static PasteCommandService instance = null;

-

-	public static PasteCommandService getInstance() {

-		if(instance == null) {

-			instance = new PasteCommandService();

-		}

-		return instance;

-	}

-

-

-	/**

-	 * Load an instance of a class

-	 * 

-	 * @param element

-	 *        the extension point

-	 * @param classAttribute

-	 *        the name of the class to load

-	 * @return the loaded Class

-	 * @throws Exception

-	 *         if the class is not loaded

-	 */

-	protected static Object createExtension(final IConfigurationElement element, final String classAttribute) throws Exception {

-		try {

-			Bundle extensionBundle = Platform.getBundle(element.getDeclaringExtension().getNamespaceIdentifier());

-			Class clazz = extensionBundle.loadClass(classAttribute);

-			Object obj = clazz.newInstance();

-			return obj;

-		} catch (Exception e) {

-			throw new Exception("unable to create Extension" + e);

-		}

-	}

-

-	protected Map<String, IPasteCommandProvider> pasteCommandProviderMap;

-

-	

-	private PasteCommandService() {

-		// Reading data from plugins

-		IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(PASTECOMMANDPROVIDER_EXTENSION_ID);

-		pasteCommandProviderMap = new HashMap<String, IPasteCommandProvider>();

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

-			getPasteCommandProvider(configElements[i]);

-		}

-

-	}

-

-	/**

-	 * Load one rule

-	 * 

-	 * @param element

-	 *        the extension point

-	 */

-	protected void getPasteCommandProvider(IConfigurationElement element) {

-		IPasteCommandProvider pasteCommandProvider = null;

-		try {

-			pasteCommandProvider = (IPasteCommandProvider)createExtension(element, element.getAttribute(REALIZATION));

-			String priority = (String)element.getAttribute(PRIORITY);

-			pasteCommandProviderMap.put(priority, pasteCommandProvider);

-

-		} catch (Exception e) {

-			Activator.log.error("- " + pasteCommandProvider + " can not be loaded: " + e.getLocalizedMessage(), e);

-		}

-	}

-

-	protected IPasteCommandProvider lookForProvider() {

-		String[] priority = { "Highest", "High", "Medium", "Low", "Lowest" };

-		IPasteCommandProvider selectedProvider = null;

-		int i = 0;

-		while(selectedProvider == null && i < priority.length) {

-			selectedProvider = pasteCommandProviderMap.get(priority[i]);

-			i++;

-		}

-		return selectedProvider;

-	}

-

-	/**

-	 * return the paste command to execute by taking account parameter

-	 * 

-	 * @param targetEditPart

-	 *        the target where object will be paste

-	 * @param systemClipboard

-	 *        contains info form the system copy paste

-	 * @param papyrusCliboard

-	 *        the list of views to paste

-	 * @return a command

-	 */

-	public ICommand getPasteViewCommand(GraphicalEditPart targetEditPart, Clipboard systemClipboard, Collection<Object> papyrusCliboard) {

-		IPasteCommandProvider selectedProvider = lookForProvider();

-		if(selectedProvider == null) {

-			return UnexecutableCommand.INSTANCE;

-		}

-		return selectedProvider.getPasteViewCommand(targetEditPart, systemClipboard, papyrusCliboard);

-	}

-	

-	/**

-	 * return the paste command to execute by taking account parameter. It copy also element of the semantic model

-	 * 

-	 * @param targetEditPart

-	 *        the target where object will be paste

-	 * @param systemClipboard

-	 *        contains info form the system copy paste

-	 * @param papyrusCliboard

-	 *        the list of views to paste

-	 * @return a command

-	 */

-	public ICommand getPasteWithModelCommand(GraphicalEditPart targetEditPart, Clipboard systemClipboard, Collection<Object> papyrusCliboard) {

-		IPasteCommandProvider selectedProvider = lookForProvider();

-		if(selectedProvider == null) {

-			return UnexecutableCommand.INSTANCE;

-		}

-		return selectedProvider.getPasteWithModelCommand(targetEditPart, systemClipboard, papyrusCliboard);

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.common.service;
+
+import java.awt.datatransfer.Clipboard;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.papyrus.uml.diagram.common.providers.IPasteCommandProvider;
+import org.eclipse.papyrus.uml.diagram.common.Activator;
+import org.osgi.framework.Bundle;
+
+/**
+ * this singleton looks for in extension point to find a pasteCommandProvider
+ * and can provide a paste command
+ */
+
+
+public class PasteCommandService {
+
+	protected static final String PASTECOMMANDPROVIDER_EXTENSION_ID = "org.eclipse.papyrus.infra.gmfdiag.common.pasteCommandProvider"; //$NON-NLS-1$
+
+	protected static final String REALIZATION = "realization"; //$NON-NLS-1$
+
+	protected static final String PRIORITY = "priority"; //$NON-NLS-1$
+
+	protected static PasteCommandService instance = null;
+
+	public static PasteCommandService getInstance() {
+		if(instance == null) {
+			instance = new PasteCommandService();
+		}
+		return instance;
+	}
+
+
+	/**
+	 * Load an instance of a class
+	 * 
+	 * @param element
+	 *        the extension point
+	 * @param classAttribute
+	 *        the name of the class to load
+	 * @return the loaded Class
+	 * @throws Exception
+	 *         if the class is not loaded
+	 */
+	protected static Object createExtension(final IConfigurationElement element, final String classAttribute) throws Exception {
+		try {
+			Bundle extensionBundle = Platform.getBundle(element.getDeclaringExtension().getNamespaceIdentifier());
+			Class clazz = extensionBundle.loadClass(classAttribute);
+			Object obj = clazz.newInstance();
+			return obj;
+		} catch (Exception e) {
+			throw new Exception("Unable to create Extension" + e); //$NON-NLS-1$
+		}
+	}
+
+	protected Map<String, IPasteCommandProvider> pasteCommandProviderMap;
+
+	
+	private PasteCommandService() {
+		// Reading data from plugins
+		IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(PASTECOMMANDPROVIDER_EXTENSION_ID);
+		pasteCommandProviderMap = new HashMap<String, IPasteCommandProvider>();
+		for(int i = 0; i < configElements.length; i++) {
+			getPasteCommandProvider(configElements[i]);
+		}
+
+	}
+
+	/**
+	 * Load one rule
+	 * 
+	 * @param element
+	 *        the extension point
+	 */
+	protected void getPasteCommandProvider(IConfigurationElement element) {
+		IPasteCommandProvider pasteCommandProvider = null;
+		try {
+			pasteCommandProvider = (IPasteCommandProvider)createExtension(element, element.getAttribute(REALIZATION));
+			String priority = (String)element.getAttribute(PRIORITY);
+			pasteCommandProviderMap.put(priority, pasteCommandProvider);
+
+		} catch (Exception e) {
+			Activator.log.error("- " + pasteCommandProvider + " can not be loaded: " + e.getLocalizedMessage(), e); //$NON-NLS-1$
+		}
+	}
+
+	protected IPasteCommandProvider lookForProvider() {
+		String[] priority = { "Highest", "High", "Medium", "Low", "Lowest" };
+		IPasteCommandProvider selectedProvider = null;
+		int i = 0;
+		while(selectedProvider == null && i < priority.length) {
+			selectedProvider = pasteCommandProviderMap.get(priority[i]);
+			i++;
+		}
+		return selectedProvider;
+	}
+
+	/**
+	 * return the paste command to execute by taking account parameter
+	 * 
+	 * @param targetEditPart
+	 *        the target where object will be paste
+	 * @param systemClipboard
+	 *        contains info form the system copy paste
+	 * @param papyrusCliboard
+	 *        the list of views to paste
+	 * @return a command
+	 */
+	public ICommand getPasteViewCommand(GraphicalEditPart targetEditPart, Clipboard systemClipboard, Collection<Object> papyrusCliboard) {
+		IPasteCommandProvider selectedProvider = lookForProvider();
+		if(selectedProvider == null) {
+			return UnexecutableCommand.INSTANCE;
+		}
+		return selectedProvider.getPasteViewCommand(targetEditPart, systemClipboard, papyrusCliboard);
+	}
+	
+	/**
+	 * return the paste command to execute by taking account parameter. It copy also element of the semantic model
+	 * 
+	 * @param targetEditPart
+	 *        the target where object will be paste
+	 * @param systemClipboard
+	 *        contains info form the system copy paste
+	 * @param papyrusCliboard
+	 *        the list of views to paste
+	 * @return a command
+	 */
+	public ICommand getPasteWithModelCommand(GraphicalEditPart targetEditPart, Clipboard systemClipboard, Collection<Object> papyrusCliboard) {
+		IPasteCommandProvider selectedProvider = lookForProvider();
+		if(selectedProvider == null) {
+			return UnexecutableCommand.INSTANCE;
+		}
+		return selectedProvider.getPasteWithModelCommand(targetEditPart, systemClipboard, papyrusCliboard);
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF
index ed1a5483cb7..cf2c1934346 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF
@@ -1,42 +1,41 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.0",

- org.eclipse.gmf.runtime.diagram.ui.actions,

- org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="1.4.0",

- org.eclipse.core.expressions,

- org.eclipse.gmf.runtime.diagram.ui.resources.editor,

- org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.1.0",

- org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="1.2.0",

- org.eclipse.gmf.runtime.diagram.ui.actions,

- org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.0.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0",

- org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.0",

- org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",

- org.eclipse.papyrus.uml.pastemanager;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.0",

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

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

-Export-Package: org.eclipse.papyrus.uml.diagram.menu,

- org.eclipse.papyrus.uml.diagram.menu.actions,

- org.eclipse.papyrus.uml.diagram.menu.actions.handlers

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.menu.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.menu;singleton:=t

- rue

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.0",
+ org.eclipse.gmf.runtime.diagram.ui.actions,
+ org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="1.4.0",
+ org.eclipse.core.expressions,
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor,
+ org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.1.0",
+ org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="1.2.0",
+ org.eclipse.gmf.runtime.diagram.ui.actions,
+ org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.0.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",
+ org.eclipse.papyrus.uml.tools;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0",
+ org.eclipse.uml2.uml;bundle-version="4.0.0",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.0.0",
+ org.eclipse.ui.ide;bundle-version="3.8.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.tools;bundle-version="1.0.0",
+ org.eclipse.emf.facet.infra.browser.custom.ui;bundle-version="0.4.0",
+ org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.4.0"
+Export-Package: org.eclipse.papyrus.uml.diagram.menu,
+ org.eclipse.papyrus.uml.diagram.menu.actions,
+ org.eclipse.papyrus.uml.diagram.menu.actions.handlers
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.0.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.menu.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.menu;singleton:=t
+ rue
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/plugin.xml
index 631bc54de33..fe5cb637888 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/plugin.xml
@@ -1,4387 +1,4387 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-<plugin>

-   <extension

-      point="org.eclipse.gmf.runtime.common.ui.services.action.contributionItemProviders">

-   <contributionItemProvider

-         checkPluginLoaded="false"

-         class="org.eclipse.papyrus.uml.diagram.menu.actions.gmf.CustomContributionItemProvider">

-      <Priority

-            name="High">

-      </Priority>

-      <!-- we rewrite this action, because the backgound of the note is black-->

-      <popupContribution

-            class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">

-         <popupAction

-               id="customAddNoteLinkAction"

-               path="/diagramAddmenu/addDiagramGeneralGroup">

-         </popupAction>

-      </popupContribution>

-   </contributionItemProvider>

-</extension>

-<extension

-      id="ID:DiagramMenuDefinition"

-      name="Name:DiagramMenuDefinition"

-      point="org.eclipse.ui.menus">

-   <menuContribution

-         allPopups="false"

-         locationURI="menu:org.eclipse.ui.main.menu?after=edit">

-      <menu

-            icon="icons/papyrus.png"

-            id="org.eclipse.papyrus.uml.diagram.ui.menu"

-            label="&amp;Diagram"

-            tooltip="Diagram Menu">

-         <visibleWhen>

-            <with

-                  variable="activeEditorId">

-               <equals

-                     value="org.eclipse.papyrus.infra.core.papyrusEditor">

-               </equals>

-            </with>

-         </visibleWhen>

-      </menu>

-   </menuContribution>

-   <menuContribution

-         allPopups="false"

-         locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu?after=filtersMenu">

-      <menu

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/selectall.gif"

-            id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.select.menu"

-            label="Se&amp;lect"

-            tooltip="Select Menu">

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SelectAllCommand"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/selectall.gif"

-               id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.select.all"

-               label="&amp;All"

-               style="push"

-               tooltip="Select All">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SelectAllShapesCommand"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/selectshapes.gif"

-               id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.select.all.shapes"

-               label="All &amp;Shapes"

-               style="push"

-               tooltip="Select All Shapes">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SelectAllConnectorsCommand"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/selectconnectors.gif"

-               id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.select.all.connectors"

-               label="All &amp;Connectors"

-               style="push"

-               tooltip="Select All Connectors">

-         </command>

-         <visibleWhen

-               checkEnabled="true">

-            <and>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-               <with

-                     variable="selection">

-                  <and>

-                     <count

-                           value="1">

-                     </count>

-                     <iterate>

-                        <instanceof

-                              value="org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart">

-                        </instanceof>

-                     </iterate>

-                  </and>

-               </with>

-            </and>

-         </visibleWhen>

-      </menu>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ArrangeAllCommand"

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/arrangeall.gif"

-            id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.arrange.all"

-            label="Arran&amp;ge All"

-            style="push"

-            tooltip="Arrange All">

-         <visibleWhen

-               checkEnabled="true">

-            <and>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-               <with

-                     variable="selection">

-                  <and>

-                     <count

-                           value="1">

-                     </count>

-                     <iterate>

-                        <instanceof

-                              value="org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart">

-                        </instanceof>

-                     </iterate>

-                  </and>

-               </with>

-            </and>

-         </visibleWhen>

-      </command>

-      <menu

-            icon="icons/papyrus.png"

-            id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.format"

-            label="For&amp;mat"

-            tooltip="Papyrus Format Menu">

-         <visibleWhen>

-            <with

-                  variable="activeEditorId">

-               <equals

-                     value="org.eclipse.papyrus.infra.core.papyrusEditor">

-               </equals>

-            </with>

-         </visibleWhen>

-      </menu>

-      <menu

-            icon="icons/papyrus.png"

-            id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.filters"

-            label="F&amp;ilters"

-            tooltip="Papyrus Filters Menu">

-         <visibleWhen>

-            <with

-                  variable="activeEditorId">

-               <equals

-                     value="org.eclipse.papyrus.infra.core.papyrusEditor">

-               </equals>

-            </with>

-         </visibleWhen>

-      </menu>

-      <separator

-            name="org.eclipse.papyrus.uml.diagram.ui.popupmenu.filters.end.separator">

-      </separator>

-   </menuContribution>

-   <menuContribution

-         allPopups="false"

-         locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu?after=endFilterMenu">

-      <menu

-            icon="icons/papyrus.png"

-            id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.view"

-            label="&amp;View"

-            tooltip="Papyrus View Menu">

-         <visibleWhen>

-            <with

-                  variable="activeEditorId">

-               <equals

-                     value="org.eclipse.papyrus.infra.core.papyrusEditor">

-               </equals>

-            </with>

-         </visibleWhen>

-      </menu>

-      <menu

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.providers/icons/zoomplus.gif"

-            id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.zoom"

-            label="&amp;Zoom"

-            tooltip="Zoom Menu">

-         <visibleWhen>

-            <with

-                  variable="activeEditorId">

-               <equals

-                     value="org.eclipse.papyrus.infra.core.papyrusEditor">

-               </equals>

-            </with>

-         </visibleWhen>

-      </menu>

-   </menuContribution>

-   <menuContribution

-         locationURI="toolbar:org.eclipse.ui.main.toolbar?after=org.eclipse.papyrus.uml.diagram.ui.toolbar">

-      <toolbar

-            id="org.eclipes.papyrus.menu.toolbar"

-            label="Papyrus Toolbar Action">

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.toolbar.command"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_style_group.gif"

-               id="org.eclipse.papyrus.menu.line.style.toolbar.command"

-               style="pulldown"

-               tooltip="Line Style Action">

-            <visibleWhen>

-               <and>

-                  <with

-                        variable="activeEditorId">

-                     <equals

-                           value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                     </equals>

-                  </with>

-               </and>

-            </visibleWhen>

-         </command>

-         <separator

-               name="org.eclipse.papyrus.uml.diagram.menu.toolbar.separator0"

-               visible="true">

-         </separator>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.CopyAppearancePropertiesCommand"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/copy_appearance_properties.gif"

-               label="Apply Appearance &amp;Properties"

-               style="push"

-               tooltip="Apply the applicable appearance properties of the last selected shape to the other selected shapes.">

-            <visibleWhen>

-               <and>

-                  <with

-                        variable="activeEditorId">

-                     <equals

-                           value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                     </equals>

-                  </with>

-               </and>

-            </visibleWhen>

-         </command>

-         <separator

-               name="org.eclipse.papyrus.uml.diagram.menu.toolbar.separator1"

-               visible="true">

-         </separator>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.toolbar.command"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/selectall.gif"

-               id="org.eclipse.papyrus.menu.select.toolbar.command"

-               style="pulldown"

-               tooltip="Select Actions">

-            <visibleWhen>

-               <and>

-                  <with

-                        variable="activeEditorId">

-                     <equals

-                           value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                     </equals>

-                  </with>

-               </and>

-            </visibleWhen>

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.toolbar.command"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/arrangeall.gif"

-               id="org.eclipse.papyrus.menu.arrange.toolbar.command"

-               style="pulldown"

-               tooltip="Arrange Actions">

-            <visibleWhen>

-               <and>

-                  <with

-                        variable="activeEditorId">

-                     <equals

-                           value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                     </equals>

-                  </with>

-               </and>

-            </visibleWhen>

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.toolbar.command"

-               icon="icons/alignleft.gif"

-               id="org.eclipse.papyrus.menu.alignment.toolbar.command"

-               style="pulldown"

-               tooltip="Alignment Actions">

-            <visibleWhen>

-               <and>

-                  <with

-                        variable="activeEditorId">

-                     <equals

-                           value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                     </equals>

-                  </with>

-               </and>

-            </visibleWhen>

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.toolbar.command"

-               icon="icons/fantom.gif"

-               id="org.eclipse.papyrus.menu.showhide.toolbar.command"

-               style="pulldown"

-               tooltip="Show/Hide Actions">

-            <visibleWhen>

-               <and>

-                  <with

-                        variable="activeEditorId">

-                     <equals

-                           value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                     </equals>

-                  </with>

-               </and>

-            </visibleWhen>

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.toolbar.command"

-               icon="icons/horizontal_by_left.gif"

-               id="org.eclipse.papyrus.menu.routing.toolbar.command"

-               style="pulldown"

-               tooltip="Routing Actions">

-            <visibleWhen>

-               <and>

-                  <with

-                        variable="activeEditorId">

-                     <equals

-                           value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                     </equals>

-                  </with>

-               </and>

-            </visibleWhen>

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.toolbar.command"

-               icon="icons/distribute_horizontally.gif"

-               id="org.eclipse.papyrus.menu.distribute.toolbar.command"

-               style="pulldown"

-               tooltip="Distribute Actions">

-            <visibleWhen>

-               <and>

-                  <with

-                        variable="activeEditorId">

-                     <equals

-                           value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                     </equals>

-                  </with>

-               </and>

-            </visibleWhen>

-         </command>

-         <separator

-               name="org.eclipse.papyrus.uml.diagram.menu.toolbar.separator2"

-               visible="true">

-         </separator>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SnapBack"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/snapback.gif"

-               label="&amp;Snap Back"

-               style="push"

-               tooltip="Reset the element to its initial location">

-            <visibleWhen

-                  checkEnabled="false">

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </visibleWhen>

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.command.autosize"

-               icon="icons/autosize.gif"

-               style="push"

-               tooltip="Auto Size">

-            <visibleWhen>

-               <and>

-                  <with

-                        variable="activeEditorId">

-                     <equals

-                           value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                     </equals>

-                  </with>

-               </and>

-            </visibleWhen>

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.toolbar.same.size.command"

-               icon="icons/size_to_control.gif"

-               id="org.eclipse.papyrus.menu.size.toolbar.command"

-               style="pulldown"

-               tooltip="Make Same Size">

-            <visibleWhen>

-               <and>

-                  <with

-                        variable="activeEditorId">

-                     <equals

-                           value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                     </equals>

-                  </with>

-               </and>

-            </visibleWhen>

-         </command>

-                  <dynamic

-               class="org.eclipse.papyrus.uml.diagram.menu.toolbar.ZoomToolbar"

-               id="zoomToolBar">

-            <visibleWhen

-                  checkEnabled="true">

-               <and>

-                  <with

-                  variable="activeEditorId">

-                     <equals

-                           value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                     </equals>

-                  </with>

-               </and>

-            </visibleWhen>

-         </dynamic>

-         <visibleWhen>

-            <with

-                  variable="activeEditorId">

-               <equals

-                     value="org.eclipse.papyrus.infra.core.papyrusEditor">

-               </equals>

-            </with>

-         </visibleWhen>

-      </toolbar>

-   </menuContribution>

-</extension>

-<extension

-      point="org.eclipse.ui.menus">

-   <menuContribution

-         locationURI="menu:org.eclipse.papyrus.menu.line.style.toolbar.command">

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.rectilinear"

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/rectilinear.gif"

-            id="org.eclipse.papyrus.menu.line.style.toolbar.rectilinear"

-            label="&amp;Rectilinear Style Routing"

-            style="toggle"

-            tooltip="Change routing to rectilinear style for connectors">

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.oblique"

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/oblique.gif"

-            id="org.eclipse.papyrus.menu.line.style.toolbar.oblique"

-            label="&amp;Oblique Style Routing"

-            style="toggle"

-            tooltip="Change routing to oblique style for connectors">

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.tree"

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/tree.gif"

-            id="org.eclipse.papyrus.menu.line.style.toolbar.tree"

-            label="&amp;Tree Style Routing"

-            style="toggle"

-            tooltip="Change routing to tree style for connectors">

-      </command>

-      <separator

-            name="org.eclipse.papyrus.menu.line.style.toolbar.separator0"

-            visible="true">

-      </separator>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.removebendpoint"

-            icon="icons/no_bendpoints.gif"

-            id="org.eclipse.papyrus.menu.line.style.toolbar.no.bendpoint"

-            label="Remove &amp;all bendpoints"

-            style="push"

-            tooltip="Remove all bendpoints on the selected connectors">

-      </command>

-   </menuContribution>

-   <menuContribution

-         locationURI="menu:org.eclipse.papyrus.menu.select.toolbar.command">

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SelectAllCommand"

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/selectall.gif"

-            label="Select &amp;All"

-            style="push"

-            tooltip="Select All">

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SelectAllShapesCommand"

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/selectshapes.gif"

-            label="Select All &amp;Shapes"

-            style="push"

-            tooltip="Select All Shapes">

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SelectAllConnectorsCommand"

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/selectconnectors.gif"

-            label="Select All &amp;Connectors"

-            style="push"

-            tooltip="Select All Connectors">

-      </command>

-   </menuContribution>

-   <menuContribution

-         locationURI="menu:org.eclipse.papyrus.menu.arrange.toolbar.command">

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ArrangeAllCommand"

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/arrangeall.gif"

-            label="Arran&amp;ge All"

-            style="push"

-            tooltip="Arrange All">

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ArrangeSelectionCommand"

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/arrangeselected.gif"

-            label="Arrange &amp;Selection"

-            style="push"

-            tooltip="Arrange Selection">

-      </command>

-   </menuContribution>

-   <menuContribution

-         locationURI="menu:org.eclipse.papyrus.menu.alignment.toolbar.command">

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.left"

-            icon="icons/alignleft.gif"

-            label="Align &amp;Left"

-            style="push">

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.center"

-            icon="icons/aligncenter.gif"

-            label="Align &amp;Center"

-            style="push">

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.right"

-            icon="icons/alignright.gif"

-            label="Align &amp;Right"

-            style="push">

-      </command>

-      <separator

-            name="org.eclipse.papyrus.uml.diagram.menu.alignment.pulldown.separator"

-            visible="true">

-      </separator>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.bottom"

-            icon="icons/alignbottom.gif"

-            label="Align &amp;Bottom"

-            style="push">

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.middle"

-            icon="icons/alignmid.gif"

-            label="Align &amp;Middle"

-

-            style="push">

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.top"

-            icon="icons/aligntop.gif"

-            label="Align &amp;Top"

-            style="push">

-      </command>

-   </menuContribution>

-   <menuContribution

-         locationURI="menu:org.eclipse.papyrus.menu.showhide.toolbar.command">

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideContentsCommand"

-            icon="icons/fantomContents.gif"

-            label="Show/Hide &amp;Contents"

-            style="push"

-            tooltip="The Show/Hide Contents Action">

-         <visibleWhen>

-            <and>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </and>

-         </visibleWhen>

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideCompartmentCommand"

-            icon="icons/fantomCompartment.gif"

-            label="Show/Hide Com&amp;partments"

-            style="push"

-            tooltip="The Show/Hide Compartments Action">

-         <visibleWhen>

-            <and>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </and>

-         </visibleWhen>

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideRelatedLinkCommand"

-            style="push">

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowRelatedLinkBetweenSelectedElementsCommand"

-            style="push">

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowAllRelatedLinkCommand"

-            style="push">

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SortFilterCompartmentItemsCommand"

-            helpContextId="ActionToolTipText"

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/sortfilter.gif"

-            label="Sort/&amp;Filter Compartments Items..."

-            style="push"

-            tooltip="Sort or Filter Compartments Items for this shape">

-         <visibleWhen>

-            <and>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </and>

-         </visibleWhen>

-      </command>

-      <separator

-            name="org.eclipse.papyrus.menu.showhide.toolbar.separator0"

-            visible="true">

-      </separator>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.link.label.show.all"

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/showconnector.gif"

-            id="org.eclipse.papyrus.menu.showhide.toolbar.all.connector.label"

-            label="&amp;All Connector Labels"

-            style="push"

-            tooltip="Display all labels on the selected connectors">

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.link.label.hide.all"

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/hideconnector.gif"

-            id="org.eclipse.papyrus.menu.showhide.toolbar.no.connector.label"

-            label="N&amp;o Connector Labels"

-            style="push"

-            tooltip="Hide all labels on the selected Connections">

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.link.label.manager"

-            icon="icons/manage_connector_label.gif"

-            id="org.eclipse.papyrus.menu.showhide.toolbar.manage.connector.label"

-            label="&amp;Manage Connector Labels"

-            style="push"

-            tooltip="Manage the labels to display for the selected connections">

-      </command>

-   </menuContribution>

-   <menuContribution

-         locationURI="menu:org.eclipse.papyrus.menu.routing.toolbar.command">

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.command.routing.left"

-            icon="icons/horizontal_by_left.gif"

-            label="Set Horizontal By &amp;Left"

-            style="push">

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.command.routing.right"

-            icon="icons/horizontal_by_right.gif"

-            label="Set Horizontal By &amp;Right"

-            style="push">

-      </command>

-      <separator

-            name="org.eclipse.papyrus.uml.diagram.menu.routing.pulldown.separator"

-            visible="true">

-      </separator>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.command.routing.top"

-            icon="icons/vertical_by_top.gif"

-            label="Set Vertical By &amp;Top"

-            style="push">

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.command.routing.bottom"

-            icon="icons/vertical_by_bottom.gif"

-            label="Set Vertical By &amp;Bottom"

-            style="push">

-      </command>

-   </menuContribution>

-   <menuContribution

-         locationURI="menu:org.eclipse.papyrus.menu.distribute.toolbar.command">

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.command.distribute.horizontally"

-            icon="icons/distribute_horizontally.gif"

-            label="Distribute Nodes/Links &amp;Horizontally"

-            style="push">

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.command.distribute.horizontally_between_nodesly"

-            icon="icons/distribute_horizontally_between_nodes.gif"

-            label="Distribute Nodes/Links H&amp;orizontally Between 2 Nodes"

-            style="push">

-      </command>

-      <separator

-            name="org.eclipse.papyrus.uml.diagram.menu.distribute.pulldown.separator"

-            visible="true">

-      </separator>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.command.distribute.vertically"

-            icon="icons/distibute_vertically.gif"

-            label="Distribute Nodes/Links &amp;Vertically"

-            style="push">

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.command.distribute.vertically_between_nodes"

-            icon="icons/distribute_vertically_between_nodes.gif"

-            label="Distribute Nodes/Links V&amp;ertically Between 2 Nodes"

-            style="push">

-      </command>

-   </menuContribution>

-   <menuContribution

-         locationURI="menu:org.eclipse.papyrus.menu.size.toolbar.command">

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.command.sameSize.both"

-            icon="icons/size_to_control.gif"

-            label="&amp;Both"

-            style="push"

-            tooltip="Set the dimension of the last selected element">

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.command.sameSize.height"

-            icon="icons/size_to_control_height.gif"

-            label="&amp;Height"

-            style="push"

-            tooltip="Set the height of the last selected element">

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.command.sameSize.width"

-            icon="icons/size_to_control_width.gif"

-            label="&amp;Width"

-            style="push"

-            tooltip="Set the width of the last selected element">

-      </command>

-   </menuContribution>

-</extension>

-<extension

-      point="org.eclipse.ui.menus">

-   <menuContribution

-         allPopups="false"

-         locationURI="menu:org.eclipse.papyrus.uml.diagram.ui.menu">

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.FontCommand"

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/font_color.gif"

-            label="&amp;Font..."

-            style="push"

-            tooltip="Font">

-         <visibleWhen

-               checkEnabled="false">

-         </visibleWhen>

-      </command>

-      <menu

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/fill_color.gif"

-            label="Fill &amp;Color"

-            tooltip="Fill Color">

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.white.command"

-                            icon="icons/colors/white.gif"

-               label="White"

-               style="push"

-               tooltip="White">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.black.command"

-               icon="icons/colors/black.gif"

-               label="Black"

-               style="push"

-               tooltip="Black">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.lightgray.command"

-               icon="icons/colors/light_gray.gif"

-               label="Light Gray"

-               style="push"

-               tooltip="Light Gray">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.gray.command"

-               icon="icons/colors/gray.gif"

-               label="Gray"

-               style="push"

-               tooltip="Gray">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.darkgray.command"

-               icon="icons/colors/dark_gray.gif"

-               label="Dark Gray"

-               style="push"

-               tooltip="Dark Gray">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.red.command"

-               icon="icons/colors/red.gif"

-               label="Red"

-               style="push"

-               tooltip="Red">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.green.command"

-               icon="icons/colors/green.gif"

-               label="Green"

-               style="push"

-               tooltip="Green">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.blue.command"

-               icon="icons/colors/blue.gif"

-               label="Blue"

-               style="push"

-               tooltip="Blue">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.yellow.command"

-               icon="icons/colors/yellow.gif"

-               label="Yellow"

-               style="push"

-               tooltip="Yellow">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.magenta.command"

-               icon="icons/colors/magenta.gif"

-               label="Magenta"

-               style="push"

-               tooltip="Magenta">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.cyan.command"

-               icon="icons/colors/cyan.gif"

-               label="Cyan"

-               style="push"

-               tooltip="Cyan">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.pink.command"

-               icon="icons/colors/pink.gif"

-               label="Pink"

-               style="push"

-               tooltip="Pink">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.orange.command"

-               icon="icons/colors/orange.gif"

-               label="Orange"

-               style="push"

-               tooltip="Orange">

-         </command>

-         <separator

-               name="org.eclipse.papyrus.uml.diagram.menu.fill.color.separator"

-               visible="true">

-         </separator>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.defaultcolor.command"

-               label="&amp;Default Color"

-               style="push"

-               tooltip="Default Colors">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.morecolors.command"

-               label="&amp;More colors..."

-               style="push"

-               tooltip="More Colors">

-         </command>

-      </menu>

-      <menu

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_color.gif"

-            label="Li&amp;ne Color"

-            tooltip="Line Color">

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.white.command"

-               icon="icons/colors/white.gif"

-               label="White"

-               style="push"

-               tooltip="White">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.black.command"

-               icon="icons/colors/black.gif"

-               label="Black"

-               style="push"

-               tooltip="Black">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.lightgray.command"

-               icon="icons/colors/light_gray.gif"

-               label="Light Gray"

-               style="push"

-               tooltip="Light Gray">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.gray.command"

-               icon="icons/colors/gray.gif"

-               label="Gray"

-               style="push"

-               tooltip="Gray">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.darkgray.command"

-               icon="icons/colors/dark_gray.gif"

-               label="Dark Gray"

-               style="push"

-               tooltip="Dark Gray">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.red.command"

-               icon="icons/colors/red.gif"

-               label="Red"

-               style="push"

-               tooltip="Red">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.green.command"

-               icon="icons/colors/green.gif"

-               label="Green"

-               style="push"

-               tooltip="Green">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.blue.command"

-               icon="icons/colors/blue.gif"

-               label="Blue"

-               style="push"

-               tooltip="Blue">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.yellow.command"

-               icon="icons/colors/yellow.gif"

-               label="Yellow"

-               style="push"

-               tooltip="Yellow">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.magenta.command"

-               icon="icons/colors/magenta.gif"

-               label="Magenta"

-               style="push"

-               tooltip="Magenta">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.cyan.command"

-               icon="icons/colors/cyan.gif"

-               label="Cyan"

-               style="push"

-               tooltip="Cyan">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.pink.command"

-               icon="icons/colors/pink.gif"

-               label="Pink"

-               style="push"

-               tooltip="Pink">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.orange.command"

-               icon="icons/colors/orange.gif"

-               label="Orange"

-               style="push"

-               tooltip="Orange">

-         </command>

-         <separator

-               name="org.eclipse.papyrus.uml.diagram.menu.line.color.separator"

-               visible="true">

-         </separator>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.defaultcolor.command"

-               label="&amp;Default Color"

-               style="push"

-               tooltip="Default Colors">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.morecolors.command"

-               label="&amp;More colors..."

-               style="push"

-               tooltip="More Colors">

-         </command>

-      </menu>

-      <menu

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_style_group.gif"

-            id="org.eclipse.papyrus.uml.diagram.ui.menu.line.style.menu"

-            label="Line &amp;Style"

-            tooltip="Line Style">

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.rectilinear"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/rectilinear.gif"

-               id="org.eclipse.papyrus.uml.diagram.ui.menu.line.style.rectilinear"

-               label="&amp;Rectilinear Style Routing"

-               style="toggle"

-               tooltip="Change routing to rectilinear style for connectors">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.oblique"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/oblique.gif"

-               id="org.eclipse.papyrus.uml.diagram.ui.menu.line.style.oblique"

-               label="&amp;Oblique Style Routing"

-               style="toggle"

-               tooltip="Change routing to oblique style for connectors">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.tree"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/tree.gif"

-               id="org.eclipse.papyrus.uml.diagram.ui.menu.line.style.tree"

-               label="&amp;Tree Style Routing"

-               style="toggle"

-               tooltip="Change routing to tree style for connectors">

-         </command>

-         <separator

-               name="org.eclipse.papyrus.uml.diagram.ui.menu.line.style.separator0"

-               visible="true">

-         </separator>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.removebendpoint"

-               icon="icons/no_bendpoints.gif"

-               id="org.eclipse.papyrus.uml.diagram.ui.menu.line.style.no.bendpoint"

-               label="Remove &amp;all bendpoints"

-               style="push"

-               tooltip="Remove all bendpoints on the selected connectors">

-         </command>

-      </menu>

-      <separator

-            name="org.eclipse.papyrus.uml.diagram.menu.separator0"

-            visible="true">

-      </separator>

-      <menu

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/selectall.gif"

-            label="Se&amp;lect"

-            tooltip="Select Menu">

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SelectAllCommand"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/selectall.gif"

-               label="&amp;All"

-               style="push"

-               tooltip="Select All">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SelectAllShapesCommand"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/selectshapes.gif"

-               label="All &amp;Shapes"

-               style="push"

-               tooltip="Select All Shapes">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SelectAllConnectorsCommand"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/selectconnectors.gif"

-               label="All &amp;Connectors"

-               style="push"

-               tooltip="Select All Connectors">

-         </command>

-      </menu>

-      <menu

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/arrangeall.gif"

-            label="A&amp;rrange"

-            tooltip="Arrange Menu">

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ArrangeAllCommand"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/arrangeall.gif"

-               label="&amp;All"

-               style="push"

-               tooltip="Arrange All">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ArrangeSelectionCommand"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/arrangeselected.gif"

-               label="&amp;Selection"

-               style="push"

-               tooltip="Arrange Selection">

-         </command>

-      </menu>

-      <menu

-            icon="icons/alignleft.gif"

-            id="org.eclipse.papyrus.uml.diagram.ui.menu.alignMenu"

-            label="Ali&amp;gnment"

-            tooltip="Alignement Menu">

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.left"

-               icon="icons/alignleft.gif"

-               label="Align &amp;Left"

-               style="push">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.center"

-               icon="icons/aligncenter.gif"

-               label="Align &amp;Center"

-               style="push">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.right"

-               icon="icons/alignright.gif"

-               label="Align &amp;Right"

-               style="push">

-         </command>

-         <separator

-               name="org.eclipse.papyrus.uml.diagram.papyrus.alignment.menu.separator"

-               visible="true">

-         </separator>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.bottom"

-               icon="icons/alignbottom.gif"

-               label="Align &amp;Bottom"

-               style="push">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.middle"

-               icon="icons/alignmid.gif"

-               label="Align &amp;Middle"

-               style="push">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.top"

-               icon="icons/aligntop.gif"

-               label="Align &amp;Top"

-               style="push">

-         </command>

-      </menu>

-      <menu

-            icon="icons/horizontal_by_left.gif"

-            id="org.eclipse.papyrus.uml.diagram.ui.menu.routingMenu"

-            label="&amp;Routing"

-            tooltip="Routing Menu">

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.command.routing.left"

-               icon="icons/horizontal_by_left.gif"

-               label="Set Horizontal By &amp;Left"

-               style="push">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.command.routing.right"

-               icon="icons/horizontal_by_right.gif"

-               label="Set Horizontal By &amp;Right"

-               style="push">

-         </command>

-         <separator

-               name="org.eclipse.papyrus.uml.diagram.papyrus.menu.separator1"

-               visible="true">

-         </separator>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.command.routing.top"

-               icon="icons/vertical_by_top.gif"

-               label="Set Vertical By &amp;Top"

-               style="push">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.command.routing.bottom"

-               icon="icons/vertical_by_bottom.gif"

-               label="Set Vertical By &amp;Bottom"

-               style="push">

-         </command>

-      </menu>

-      <menu

-            icon="icons/distribute_horizontally.gif"

-            id="org.eclipse.papyrus.uml.diagram.ui.menu.distributeMenu"

-            label="&amp;Distribution"

-            tooltip="Distribute Menu">

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.command.distribute.horizontally"

-               icon="icons/distribute_horizontally.gif"

-               label="Distribute Nodes/Links &amp;Horizontally"

-               style="push">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.command.distribute.horizontally_between_nodesly"

-               icon="icons/distribute_horizontally_between_nodes.gif"

-               label="Distribute Nodes/Links H&amp;orizontally Between 2 Nodes"

-               style="push">

-         </command>

-         <separator

-               name="org.eclipse.papyrus.uml.diagram.menu.distribute.menu.separator"

-               visible="true">

-         </separator>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.command.distribute.vertically"

-               icon="icons/distibute_vertically.gif"

-               label="Distribute Nodes/Links &amp;Vertically"

-               style="push">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.command.distribute.vertically_between_nodes"

-               icon="icons/distribute_vertically_between_nodes.gif"

-               label="Distribute Nodes/Links V&amp;ertically Between 2 Nodes"

-               style="push">

-         </command>

-      </menu>

-      <menu

-            label="&amp;Order"

-            tooltip="Order">

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.BringToFrontCommand"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/bring_to_front.gif"

-               label="Bring To &amp;Front"

-               style="push"

-               tooltip="Bring To Front">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SendToBackCommand"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/send_to_back.gif"

-               label="Send To &amp;Back"

-               style="push"

-               tooltip="Send To Back">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.BringForwardCommand"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/bring_forward.gif"

-               label="Bring F&amp;orward"

-               style="push"

-               tooltip="Bring Forward">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SendBackwardCommand"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/send_backward.gif"

-               label="Send B&amp;ackward"

-               style="push"

-               tooltip="Send Backward">

-         </command>

-      </menu>

-      <separator

-            name="org.eclipse.papyrus.uml.diagram.menu.separator1"

-            visible="true">

-      </separator>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SnapBack"

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/snapback.gif"

-            label="&amp;Snap Back"

-            style="push"

-            tooltip="Reset the element to its initial location">

-         <visibleWhen

-               checkEnabled="false">

-            <with

-                  variable="activeEditorId">

-               <equals

-                     value="org.eclipse.papyrus.infra.core.papyrusEditor">

-               </equals>

-            </with>

-         </visibleWhen>

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.command.autosize"

-            icon="icons/autosize.gif"

-            label="&amp;Auto Size"

-            style="push"

-            tooltip="Auto Size">

-      </command>

-      <menu

-            icon="icons/size_to_control.gif"

-            id="org.eclipse.papyrus.uml.diagram.ui.menu.sameSizeMenu"

-            label="&amp;Make Same Size"

-            tooltip="Make Same Size Menu">

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.command.sameSize.both"

-               icon="icons/size_to_control.gif"

-               label="&amp;Both"

-               style="push"

-               tooltip="Set the dimension of the last selected element">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.command.sameSize.height"

-               icon="icons/size_to_control_height.gif"

-               label="&amp;Height"

-               style="push"

-               tooltip="Set the height of the last selected element">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.command.sameSize.width"

-               icon="icons/size_to_control_width.gif"

-               label="&amp;Width"

-               style="push"

-               tooltip="Set the width of the last selected element">

-         </command>

-      </menu>

-      <separator

-            name="org.eclipse.papyrus.uml.diagram.menu.separator2"

-            visible="true">

-      </separator>

-      <menu

-            icon="icons/fantom.gif"

-            id="org.eclipse.papyrus.uml.diagram.ui.menu.filtersMenu"

-            label="&amp;Filters"

-            tooltip="Filters Menu">

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideContentsCommand"

-               icon="icons/fantomContents.gif"

-               id="showh"

-               label="Show/Hide &amp;Contents"

-               style="push"

-               tooltip="The Show/Hide Contents Action">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideCompartmentCommand"

-               icon="icons/fantomCompartment.gif"

-               label="Show/Hide &amp;Compartments"

-               style="push"

-               tooltip="The Show/Hide Compartments Action">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideRelatedLinkCommand"

-               style="push">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowRelatedLinkBetweenSelectedElementsCommand"

-               style="push">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideRelatedLinkCommand"

-               style="push">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SortFilterCompartmentItemsCommand"

-               helpContextId="ActionToolTipText"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/sortfilter.gif"

-               label="Sort/&amp;Filter Compartments Items..."

-               style="push"

-               tooltip="Sort or Filter Compartments Items for this shape">

-         </command>

-         <separator

-               name="org.eclipse.papyrus.uml.diagram.ui.menu.filtersMenu.separator0"

-               visible="true">

-         </separator>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.link.label.show.all"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/showconnector.gif"

-               id="org.eclipse.papyrus.uml.diagram.ui.menu.filtersMenu.all.connector.label"

-               label="&amp;All Connector Labels"

-               style="push"

-               tooltip="Display all labels on the selected connectors">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.link.label.hide.all"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/hideconnector.gif"

-               id="org.eclipse.papyrus.uml.diagram.ui.menu.filtersMenu.no.connector.label"

-               label="N&amp;o Connector Labels"

-               style="push"

-               tooltip="Hide all labels on the selected Connections">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.link.label.manager"

-               icon="icons/manage_connector_label.gif"

-               id="org.eclipse.papyrus.uml.diagram.ui.menu.filtersMenu.manage.connector.label"

-               label="&amp;Manage Connector Labels"

-               style="push"

-               tooltip="Manage the labels to display for the selected connections">

-         </command>

-      </menu>

-      <separator

-            name="org.eclipse.papyrus.uml.diagram.menu.separator3"

-            visible="true">

-      </separator>

-      <menu

-            label="&amp;View"

-            tooltip="This Menu provides Action for the View">

-         <command

-               commandId="org.eclipse.papyrus.infra.gmfdiag.menu.ViewGridCommand"

-               label="&amp;Grid"

-               style="toggle"

-               tooltip="Toggle the grid lines on the diagram">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.infra.gmfdiag.menu.ViewRulersCommand"

-               label="&amp;Rulers"

-               style="toggle"

-               tooltip="Toggle the rulers on the diagram">

-         </command>

-         <separator

-               name="org.eclipse.papyrus.uml.diagram.menu.view.separator"

-               visible="true">

-         </separator>

-         <command

-               commandId="org.eclipse.papyrus.infra.gmfdiag.menu.ViewPageBreaksCommand"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/viewpagebreaks.gif"

-               label="&amp;Page Breaks"

-               style="toggle"

-               tooltip="Show the page breaks on the diagram">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.infra.gmfdiag.menu.RecalculatePageBreaksCommand"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/recalcpagebreaks.gif"

-               label="&amp;Recalculate Page Breaks"

-               style="push"

-               tooltip="Recalculate Page Breaks">

-         </command>

-         <separator

-               name="org.eclipse.papyrus.uml.diagram.menu.view.separator1"

-               visible="true">

-         </separator>

-         <command

-               commandId="org.eclipse.papyrus.infra.gmfdiag.menu.SnapToGridCommand"

-               label="&amp;Snap to Grid"

-               style="toggle"

-               tooltip="Toggle Snap to Grid">

-         </command>

-      </menu>

-       <menu

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.providers/icons/zoomplus.gif"

-            id="org.eclipse.papyrus.uml.diagram.ui.menu.zoomMenu"

-            label="&amp;Zoom"

-            tooltip="Zoom Menu">

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomInCommand"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/zoomplus.gif"

-               label="Zoom &amp;In"

-               style="push">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomOutCommand"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/zoomminus.gif"

-               label="Zoom &amp;Out"

-               style="push">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.Zoom100Command"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/zoom100.gif"

-               label="Zoom &amp;to 100%"

-               style="push">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomFitCommand"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/zoomtofit.gif"

-               label="Zoom to &amp;Fit"

-               style="push">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomWidthCommand"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/zoomtofit.gif"

-               label="Fit to &amp;Width"

-               style="push">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomHeightCommand"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/zoomtofit.gif"

-               label="Fit to &amp;Height"

-               style="push">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomSelectionCommand"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/zoomtofit.gif"

-               label="Fit to &amp;Selection"

-               style="push">

-         </command>

-      </menu>

-      <separator

-            name="org.eclipse.papyrus.uml.diagram.menu.separator4"

-            visible="true">

-      </separator>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.CopyAppearancePropertiesCommand"

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/copy_appearance_properties.gif"

-            label="Apply Appearance &amp;Properties"

-            style="push"

-            tooltip="Apply the applicable appearance properties of the last selected shape to the other selected shapes.">

-         <visibleWhen>

-            <and>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </and>

-         </visibleWhen>

-      </command>

-   </menuContribution>

-</extension>

-<extension

-      point="org.eclipse.ui.menus">

-   <menuContribution

-         allPopups="false"

-         locationURI="popup:org.eclipse.papyrus.uml.diagram.ui.popupmenu.format">

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.FontCommand"

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/font_color.gif"

-            label="&amp;Font..."

-            style="push"

-            tooltip="Font">

-         <visibleWhen

-               checkEnabled="false">

-         </visibleWhen>

-      </command>

-      <menu

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/fill_color.gif"

-            label="Fill &amp;Color"

-            tooltip="Fill Color">

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.white.command"

-               icon="icons/colors/white.gif"

-               label="White"

-               style="push"

-               tooltip="White">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.black.command"

-               icon="icons/colors/black.gif"

-               label="Black"

-               style="push"

-               tooltip="Black">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.lightgray.command"

-               icon="icons/colors/light_gray.gif"

-               label="Light Gray"

-               style="push"

-               tooltip="Light Gray">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.gray.command"

-               icon="icons/colors/gray.gif"

-               label="Gray"

-               style="push"

-               tooltip="Gray">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.darkgray.command"

-               icon="icons/colors/dark_gray.gif"

-               label="Dark Gray"

-               style="push"

-               tooltip="Dark Gray">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.red.command"

-               icon="icons/colors/red.gif"

-               label="Red"

-               style="push"

-               tooltip="Red">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.green.command"

-               icon="icons/colors/green.gif"

-               label="Green"

-               style="push"

-               tooltip="Green">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.blue.command"

-               icon="icons/colors/blue.gif"

-               label="Blue"

-               style="push"

-               tooltip="Blue">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.yellow.command"

-               icon="icons/colors/yellow.gif"

-               label="Yellow"

-               style="push"

-               tooltip="Yellow">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.magenta.command"

-               icon="icons/colors/magenta.gif"

-               label="Magenta"

-               style="push"

-               tooltip="Magenta">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.cyan.command"

-               icon="icons/colors/cyan.gif"

-               label="Cyan"

-               style="push"

-               tooltip="Cyan">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.pink.command"

-               icon="icons/colors/pink.gif"

-               label="Pink"

-               style="push"

-               tooltip="Pink">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.orange.command"

-               icon="icons/colors/orange.gif"

-               label="Orange"

-               style="push"

-               tooltip="Orange">

-         </command>

-         <separator

-               name="org.eclipse.papyrus.uml.diagram.menu.fill.color.separator"

-               visible="true">

-         </separator>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.defaultcolor.command"

-               label="&amp;Default Color"

-               style="push"

-               tooltip="Default Colors">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.morecolors.command"

-               label="&amp;More colors..."

-               style="push"

-               tooltip="More Colors">

-         </command>

-      </menu>

-      <menu

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_color.gif"

-            label="Li&amp;ne Color"

-            tooltip="Line Color">

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.white.command"

-               icon="icons/colors/white.gif"

-               label="White"

-               style="push"

-               tooltip="White">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.black.command"

-               icon="icons/colors/black.gif"

-               label="Black"

-               style="push"

-               tooltip="Black">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.lightgray.command"

-               icon="icons/colors/light_gray.gif"

-               label="Light Gray"

-               style="push"

-               tooltip="Light Gray">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.gray.command"

-               icon="icons/colors/gray.gif"

-               label="Gray"

-               style="push"

-               tooltip="Gray">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.darkgray.command"

-               icon="icons/colors/dark_gray.gif"

-               label="Dark Gray"

-               style="push"

-               tooltip="Dark Gray">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.red.command"

-               icon="icons/colors/red.gif"

-               label="Red"

-               style="push"

-               tooltip="Red">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.green.command"

-               icon="icons/colors/green.gif"

-               label="Green"

-               style="push"

-               tooltip="Green">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.blue.command"

-               icon="icons/colors/blue.gif"

-               label="Blue"

-               style="push"

-               tooltip="Blue">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.yellow.command"

-               icon="icons/colors/yellow.gif"

-               label="Yellow"

-               style="push"

-               tooltip="Yellow">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.magenta.command"

-               icon="icons/colors/magenta.gif"

-               label="Magenta"

-               style="push"

-               tooltip="Magenta">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.cyan.command"

-               icon="icons/colors/cyan.gif"

-               label="Cyan"

-               style="push"

-               tooltip="Cyan">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.pink.command"

-               icon="icons/colors/pink.gif"

-               label="Pink"

-               style="push"

-               tooltip="Pink">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.orange.command"

-               icon="icons/colors/orange.gif"

-               label="Orange"

-               style="push"

-               tooltip="Orange">

-         </command>

-         <separator

-               name="org.eclipse.papyrus.uml.diagram.menu.line.color.separator"

-               visible="true">

-         </separator>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.defaultcolor.command"

-               label="&amp;Default Color"

-               style="push"

-               tooltip="Default Colors">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.morecolors.command"

-               label="&amp;More colors..."

-               style="push"

-               tooltip="More Colors">

-         </command>

-      </menu>

-      <menu

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_style_group.gif"

-            id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.format.line.style.menu"

-            label="Line &amp;Style"

-            tooltip="Line Style">

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.rectilinear"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/rectilinear.gif"

-               id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.format.line.style.rectilinear"

-               label="&amp;Rectilinear Style Routing"

-               style="toggle"

-               tooltip="Change routing to rectilinear style for connectors">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.oblique"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/oblique.gif"

-               id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.format.line.style.oblique"

-               label="&amp;Oblique Style Routing"

-               style="toggle"

-               tooltip="Change routing to oblique style for connectors">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.tree"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/tree.gif"

-               id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.format.line.style.tree"

-               label="&amp;Tree Style Routing"

-               style="toggle"

-               tooltip="Change routing to tree style for connectors">

-         </command>

-         <separator

-               name="org.eclipse.papyrus.uml.diagram.ui.popupmenu.format.line.style.separator0"

-               visible="true">

-         </separator>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.removebendpoint"

-               icon="icons/no_bendpoints.gif"

-               id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.format.line.style.no.bendpoint"

-               label="Remove &amp;all bendpoints"

-               style="push"

-               tooltip="Remove all bendpoints on the selected connectors">

-         </command>

-      </menu>

-      <separator

-            name="org.eclipse.papyrus.uml.diagram.menu.popup.separator0"

-            visible="true">

-      </separator>

-      <menu

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/arrangeall.gif"

-            label="A&amp;rrange"

-            tooltip="Arrange Menu">

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ArrangeAllCommand"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/arrangeall.gif"

-               label="&amp;All"

-               style="push"

-               tooltip="Arrange All">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ArrangeSelectionCommand"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/arrangeselected.gif"

-               label="&amp;Selection"

-               style="push"

-               tooltip="Arrange Selection">

-         </command>

-      </menu>

-      <menu

-            icon="icons/alignleft.gif"

-            id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.format.alignMenu"

-            label="Ali&amp;gnment"

-            tooltip="Alignement Menu">

-         mmand>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.left"

-               icon="icons/alignleft.gif"

-               label="Align &amp;Left"

-               style="push">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.center"

-               icon="icons/aligncenter.gif"

-               label="Align &amp;Center"

-               style="push">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.right"

-               icon="icons/alignright.gif"

-               label="Align &amp;Right"

-               style="push">

-         </command>

-         <separator

-               name="org.eclipse.papyrus.uml.diagram.papyrus.alignment.popup.separator"

-               visible="true">

-         </separator>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.bottom"

-               icon="icons/alignbottom.gif"

-               label="Align &amp;Bottom"

-               style="push">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.middle"

-               icon="icons/alignmid.gif"

-               label="Align &amp;Middle"

-               style="push">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.top"

-               icon="icons/aligntop.gif"

-               label="Align &amp;Top"

-               style="push">

-         </command>

-      </menu>

-      <menu

-            icon="icons/horizontal_by_left.gif"

-            id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.format.routingMenu"

-            label="&amp;Routing"

-            tooltip="Routing Menu">

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.command.routing.left"

-               icon="icons/horizontal_by_left.gif"

-               label="Set Horizontal By &amp;Left"

-               style="push">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.command.routing.right"

-               icon="icons/horizontal_by_right.gif"

-               label="Set Horizontal By &amp;Right"

-               style="push">

-         </command>

-         <separator

-               name="org.eclipse.papyrus.uml.diagram.menu.routing.popup.separator"

-               visible="true">

-         </separator>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.command.routing.top"

-               icon="icons/vertical_by_top.gif"

-               label="Set Vertical By &amp;Top"

-               style="push">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.command.routing.bottom"

-               icon="icons/vertical_by_bottom.gif"

-               label="Set Vertical By &amp;Bottom"

-               style="push">

-         </command>

-      </menu>

-      <menu

-            icon="icons/distribute_horizontally.gif"

-            id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.format.distributeMenu"

-            label="&amp;Distribution"

-            tooltip="Distribute Menu">

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.command.distribute.horizontally"

-               icon="icons/distribute_horizontally.gif"

-               label="Distribute Nodes/Links &amp;Horizontally"

-               style="push">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.command.distribute.horizontally_between_nodesly"

-               icon="icons/distribute_horizontally_between_nodes.gif"

-               label="Distribute Nodes/Links H&amp;orizontally Between 2 Nodes"

-               style="push">

-         </command>

-         <separator

-               name="org.eclipse.papyrus.uml.diagram.menu.distribute.popup.separator"

-               visible="true">

-         </separator>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.command.distribute.vertically"

-               icon="icons/distibute_vertically.gif"

-               label="Distribute Nodes/Links &amp;Vertically"

-               style="push">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.command.distribute.vertically_between_nodes"

-               icon="icons/distribute_vertically_between_nodes.gif"

-               label="Distribute Nodes/Links V&amp;ertically Between 2 Nodes"

-               style="push">

-         </command>

-      </menu>

-      <menu

-            label="&amp;Order"

-            tooltip="Order">

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.BringToFrontCommand"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/bring_to_front.gif"

-               label="Bring To &amp;Front"

-               style="push"

-               tooltip="Bring To Front">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SendToBackCommand"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/send_to_back.gif"

-               label="Send To &amp;Back"

-               style="push"

-               tooltip="Send To Back">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.BringForwardCommand"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/bring_forward.gif"

-               label="Bring F&amp;orward"

-               style="push"

-               tooltip="Bring Forward">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SendBackwardCommand"

-               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/send_backward.gif"

-               label="Send B&amp;ackward"

-               style="push"

-               tooltip="Send Backward">

-         </command>

-      </menu>

-      <separator

-            name="org.eclipse.papyrus.uml.diagram.menu.popup.separator1"

-            visible="true">

-      </separator>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SnapBack"

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/snapback.gif"

-            label="&amp;Snap Back"

-            style="push"

-            tooltip="Reset the element to its initial location">

-         <visibleWhen

-               checkEnabled="false">

-            <with

-                  variable="activeEditorId">

-               <equals

-                     value="org.eclipse.papyrus.infra.core.papyrusEditor">

-               </equals>

-            </with>

-         </visibleWhen>

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.command.autosize"

-            icon="icons/autosize.gif"

-            label="&amp;Autozise"

-            style="push"

-            tooltip="Auto Size">

-         <visibleWhen>

-            <and>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </and>

-         </visibleWhen>

-      </command>

-      <menu

-            icon="icons/size_to_control.gif"

-            id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.format.sameSizeMenu"

-            label="&amp;Make Same Size"

-            tooltip="Make Same Size Menu">

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.command.sameSize.both"

-               icon="icons/size_to_control.gif"

-               label="&amp;Both"

-               style="push"

-               tooltip="Set the dimension of the last selected element">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.command.sameSize.height"

-               icon="icons/size_to_control_height.gif"

-               label="&amp;Height"

-               style="push"

-               tooltip="Set the height of the last selected element">

-         </command>

-         <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.command.sameSize.width"

-               icon="icons/size_to_control_width.gif"

-               label="&amp;Width"

-               style="push"

-               tooltip="Set the width of the last selected element">

-         </command>

-      </menu>

-      <separator

-            name="org.eclipse.papyrus.uml.diagram.menu.popup.separator2"

-            visible="true">

-      </separator>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.CopyAppearancePropertiesCommand"

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/copy_appearance_properties.gif"

-            label="Apply Appearance &amp;Properties"

-            style="push"

-            tooltip="Apply the applicable appearance properties of the last selected shape to the other selected shapes.">

-         <visibleWhen>

-            <and>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </and>

-         </visibleWhen>

-      </command>

-   </menuContribution>

-   <menuContribution

-         allPopups="false"

-         locationURI="popup:org.eclipse.papyrus.uml.diagram.ui.popupmenu.filters">

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideContentsCommand"

-            icon="icons/fantomContents.gif"

-            id="showhidecontents.popup"

-            label="Show/Hide &amp;Contents"

-            style="push"

-            tooltip="The Show/Hide Contents Action">

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideCompartmentCommand"

-            icon="icons/fantomCompartment.gif"

-            id="showhidecompartments.popup"

-            label="Show/Hide Com&amp;partments"

-            style="push"

-            tooltip="The Show/Hide Compartments Action">

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideRelatedLinkCommand"

-            style="push">

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowRelatedLinkBetweenSelectedElementsCommand"

-            style="push">

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowAllRelatedLinkCommand"

-            style="push">

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SortFilterCompartmentItemsCommand"

-            helpContextId="ActionToolTipText"

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/sortfilter.gif"

-            label="Sort/&amp;Filter Compartments Items..."

-            style="push"

-            tooltip="Sort or Filter Compartments Items for this shape">

-      </command>

-      <separator

-            name="org.eclipse.papyrus.uml.diagram.ui.popupmenu.filters.separator0"

-            visible="true">

-      </separator>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.link.label.show.all"

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/showconnector.gif"

-            id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.filters.all.connector.label"

-            label="&amp;All Connector Labels"

-            style="push"

-            tooltip="Display all labels on the selected connectors">

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.link.label.hide.all"

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/hideconnector.gif"

-            id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.filters.no.connector.label"

-            label="N&amp;o Connector Labels"

-            style="push"

-            tooltip="Hide all labels on the selected Connections">

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.link.label.manager"

-            icon="icons/manage_connector_label.gif"

-            id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.filters.manage.connector.label"

-            label="&amp;Manage Connector Labels"

-            style="push"

-            tooltip="Manage the labels to display for the selected connections">

-      </command>

-   </menuContribution>

-   <menuContribution

-         allPopups="false"

-         locationURI="popup:org.eclipse.papyrus.uml.diagram.ui.popupmenu.view">

-      <command

-            commandId="org.eclipse.papyrus.infra.gmfdiag.menu.ViewGridCommand"

-            label="&amp;Grid"

-            style="toggle"

-            tooltip="Toggle the grid lines on the diagram">

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.infra.gmfdiag.menu.ViewRulersCommand"

-            label="&amp;Rulers"

-            style="toggle"

-            tooltip="Toggle the rulers on the diagram">

-      </command>

-      <separator

-            name="org.eclipse.papyrus.uml.diagram.menu.popup.view.separator1"

-            visible="true">

-      </separator>

-      <command

-            commandId="org.eclipse.papyrus.infra.gmfdiag.menu.ViewPageBreaksCommand"

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/viewpagebreaks.gif"

-            label="&amp;Page Breaks"

-            style="toggle"

-            tooltip="Show the page breaks on the diagram">

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.infra.gmfdiag.menu.RecalculatePageBreaksCommand"

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/recalcpagebreaks.gif"

-            label="&amp;Recalculate Page Breaks"

-            style="push"

-            tooltip="Recalculate Page Breaks">

-      </command>

-      <separator

-            name="org.eclipse.papyrus.uml.diagram.menu.popup.view.separator2"

-            visible="true">

-      </separator>

-      <command

-            commandId="org.eclipse.papyrus.infra.gmfdiag.menu.SnapToGridCommand"

-            label="Snap to &amp;Grid"

-            style="toggle"

-            tooltip="Toggle Snap to Grid">

-      </command>

-   </menuContribution>

-   <menuContribution

-         allPopups="false"

-         locationURI="popup:org.eclipse.papyrus.uml.diagram.ui.popupmenu.zoom">

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomInCommand"

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/zoomplus.gif"

-            label="Zoom &amp;In"

-            style="push">

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomOutCommand"

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/zoomminus.gif"

-            label="Zoom &amp;Out"

-            style="push">

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.Zoom100Command"

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/zoom100.gif"

-            label="Zoom &amp;to 100%"

-            style="push">

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomFitCommand"

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/zoomtofit.gif"

-            label="Zoom to &amp;Fit"

-            style="push">

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomWidthCommand"

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/zoomtofit.gif"

-            label="Fit to &amp;Width"

-            style="push">

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomHeightCommand"

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/zoomtofit.gif"

-            label="Fit to &amp;Heightight"

-            style="push">

-      </command>

-      <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomSelectionCommand"

-            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/zoomtofit.gif"

-            label="Fit to &amp;Selection"

-            style="push">

-      </command>

-   </menuContribution>

-</extension>

-<extension

-      point="org.eclipse.ui.commands">

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         defaultHandler="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.DropDownToolBarHandler"

-         id="org.eclipse.papyrus.uml.diagram.menu.toolbar.command"

-         name="Command for the toolbar actions">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         defaultHandler="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.DropDownToolBarSameSizeHandler"

-         id="org.eclipse.papyrus.uml.diagram.menu.toolbar.same.size.command"

-         name="Command for the Make Same Size Toolbar actions">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="Call the Routing By Left Action"

-         id="org.eclipse.papyrus.uml.diagram.menu.command.routing.left"

-         name="Routing By Left Command">

-      <defaultHandler

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.RoutingHandler">

-         <parameter

-               name="org.eclipse.papyrus.uml.diagram.menu.commandRoutingParameter"

-               value="parameter_left">

-         </parameter>

-      </defaultHandler>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="Call the Routing By Right Action"

-         id="org.eclipse.papyrus.uml.diagram.menu.command.routing.right"

-         name="Routing By Righ Command">

-      <defaultHandler

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.RoutingHandler">

-         <parameter

-               name="org.eclipse.papyrus.uml.diagram.menu.commandRoutingParameter"

-               value="parameter_right">

-         </parameter>

-      </defaultHandler>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="Call the Routing By Top Action"

-         id="org.eclipse.papyrus.uml.diagram.menu.command.routing.top"

-         name="Routing By Top Command">

-      <defaultHandler

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.RoutingHandler">

-         <parameter

-               name="org.eclipse.papyrus.uml.diagram.menu.commandRoutingParameter"

-               value="parameter_top">

-         </parameter>

-      </defaultHandler>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="Call the Routing By Bottom Action"

-         id="org.eclipse.papyrus.uml.diagram.menu.command.routing.bottom"

-         name="Routing By Bottom Command">

-      <defaultHandler

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.RoutingHandler">

-         <parameter

-               name="org.eclipse.papyrus.uml.diagram.menu.commandRoutingParameter"

-               value="parameter_bottom">

-         </parameter>

-      </defaultHandler>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="Call the Distribute Nodes/Links Figure Horizontally"

-         id="org.eclipse.papyrus.uml.diagram.menu.command.distribute.horizontally"

-         name="Distribute Nodes/Links horizontally">

-      <defaultHandler

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.DistributionHandler">

-         <parameter

-               name="org.eclipse.papyrus.uml.diagram.menu.commandDistributionParameter"

-               value="parameter_horizontally">

-         </parameter>

-      </defaultHandler>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="Call the Distribute Nodes/Links Horizontally Between 2 Nodes"

-         id="org.eclipse.papyrus.uml.diagram.menu.command.distribute.horizontally_between_nodesly"

-         name="Distribute Nodes/Links Horizontally Between 2 Nodes">

-      <defaultHandler

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.DistributionHandler">

-         <parameter

-               name="org.eclipse.papyrus.uml.diagram.menu.commandDistributionParameter"

-               value="parameter_horizontally_between_nodes">

-         </parameter>

-      </defaultHandler>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="Call the Distribute Nodes/Links Vertically"

-         id="org.eclipse.papyrus.uml.diagram.menu.command.distribute.vertically"

-         name="Distribute Nodes/Links Vertically">

-      <defaultHandler

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.DistributionHandler">

-         <parameter

-               name="org.eclipse.papyrus.uml.diagram.menu.commandDistributionParameter"

-               value="parameter_vertically">

-         </parameter>

-      </defaultHandler>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="Call the Distribute Nodes/Links Vertically Between 2 Nodes"

-         id="org.eclipse.papyrus.uml.diagram.menu.command.distribute.vertically_between_nodes"

-         name="Distribute Nodes/Links Vertically Between 2 Nodes">

-      <defaultHandler

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.DistributionHandler">

-         <parameter

-               name="org.eclipse.papyrus.uml.diagram.menu.commandDistributionParameter"

-               value="parameter_vertically_between_nodes">

-         </parameter>

-      </defaultHandler>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="Call the Align on Left Command"

-         id="org.eclipse.papyrus.uml.diagram.menu.command.alignment.left"

-         name="Align Left Command">

-      <defaultHandler

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.AlignementHandler">

-         <parameter

-               name="org.eclipse.papyrus.uml.diagram.menu.commandAlignmentParameter"

-               value="parameter_left">

-         </parameter>

-      </defaultHandler>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="Call the Align on Center Command"

-         id="org.eclipse.papyrus.uml.diagram.menu.command.alignment.center"

-         name="Align Center Command">

-      <defaultHandler

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.AlignementHandler">

-         <parameter

-               name="org.eclipse.papyrus.uml.diagram.menu.commandAlignmentParameter"

-               value="parameter_center">

-         </parameter>

-      </defaultHandler>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="Call the Align on Right Command"

-         id="org.eclipse.papyrus.uml.diagram.menu.command.alignment.right"

-         name="Align Right Command">

-      <defaultHandler

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.AlignementHandler">

-         <parameter

-               name="org.eclipse.papyrus.uml.diagram.menu.commandAlignmentParameter"

-               value="parameter_right">

-         </parameter>

-      </defaultHandler>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="Call the Align on Bottom Command"

-         id="org.eclipse.papyrus.uml.diagram.menu.command.alignment.bottom"

-         name="Align Bottom Command">

-      <defaultHandler

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.AlignementHandler">

-         <parameter

-               name="org.eclipse.papyrus.uml.diagram.menu.commandAlignmentParameter"

-               value="parameter_bottom">

-         </parameter>

-      </defaultHandler>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="Call the Align on Middle Command"

-         id="org.eclipse.papyrus.uml.diagram.menu.command.alignment.middle"

-         name="Align Middle Command">

-      <defaultHandler

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.AlignementHandler">

-         <parameter

-               name="org.eclipse.papyrus.uml.diagram.menu.commandAlignmentParameter"

-               value="parameter_middle">

-         </parameter>

-      </defaultHandler>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="Call the Align on Top Command"

-         id="org.eclipse.papyrus.uml.diagram.menu.command.alignment.top"

-         name="Align Top Command">

-      <defaultHandler

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.AlignementHandler">

-         <parameter

-               name="org.eclipse.papyrus.uml.diagram.menu.commandAlignmentParameter"

-               value="parameter_top">

-         </parameter>

-      </defaultHandler>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="Call the Make Same Size Both Action"

-         id="org.eclipse.papyrus.uml.diagram.menu.command.sameSize.both"

-         name="Make Same Size Both">

-      <defaultHandler

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.SizeHandler">

-         <parameter

-               name="org.eclipse.papyrus.uml.diagram.menu.commandSizeParameter"

-               value="parameter_both">

-         </parameter>

-      </defaultHandler>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="Call the Make Same Size Height Action"

-         id="org.eclipse.papyrus.uml.diagram.menu.command.sameSize.height"

-         name="Make Same Height">

-      <defaultHandler

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.SizeHandler">

-         <parameter

-               name="org.eclipse.papyrus.uml.diagram.menu.commandSizeParameter"

-               value="parameter_height">

-         </parameter>

-      </defaultHandler>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="Call the Make Width Size Action"

-         id="org.eclipse.papyrus.uml.diagram.menu.command.sameSize.width"

-         name="Make Same Width Both">

-      <defaultHandler

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.SizeHandler">

-         <parameter

-               name="org.eclipse.papyrus.uml.diagram.menu.commandSizeParameter"

-               value="parameter_width">

-         </parameter>

-      </defaultHandler>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="Call the Auto Size Action"

-         id="org.eclipse.papyrus.uml.diagram.menu.command.autosize"

-         name="Auto Size">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="Call the Show/Hide Compartments Action"

-         id="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideCompartmentCommand"

-         name="Show/Hide Compartments Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="Call the Show/Hide Contents Action"

-         id="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideContentsCommand"

-         name="Show/Hide Contents Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-          description="Call the Show/Hide Related Link Action"

-         id="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideRelatedLinkCommand"

-         name="Show/Hide Related Link">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="Call the Show/Hide Related Link In Selection Action"

-         id="org.eclipse.papyrus.uml.diagram.menu.commands.ShowRelatedLinkBetweenSelectedElementsCommand"

-         name="Show Related Link In Selection">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="Call the Show All Related Link Action"

-         id="org.eclipse.papyrus.uml.diagram.menu.commands.ShowAllRelatedLinkCommand"

-         name="Show All Related Link">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="Copy the appearance properties"

-         id="org.eclipse.papyrus.uml.diagram.menu.commands.CopyAppearancePropertiesCommand"

-         name="Copy Appearance Properties Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="Call the Command  to manage the displayed label on links"

-         id="org.eclipse.papyrus.uml.diagram.menu.commands.link.label.manager"

-         name="Manage Displayed Labels Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="Call the Command to show all labels on links"

-         id="org.eclipse.papyrus.uml.diagram.menu.commands.link.label.show.all"

-         name="Show all labels on links">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="Call the Command to hide all labels on links"

-         id="org.eclipse.papyrus.uml.diagram.menu.commands.link.label.hide.all"

-         name="Hide all labels on links">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="Reset the label to its initial location"

-         id="org.eclipse.papyrus.uml.diagram.menu.commands.SnapBack"

-         name="Snap Back">

-   </command>

-</extension>

-<extension

-      id="viewCommands"

-      point="org.eclipse.ui.commands">

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to view the Grid"

-         id="org.eclipse.papyrus.infra.gmfdiag.menu.ViewGridCommand"

-         name="Grid Command">

-      <state

-            class="org.eclipse.jface.commands.ToggleState"

-            id="org.eclipse.ui.commands.toggleState">

-      </state>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to view the Rulers"

-         id="org.eclipse.papyrus.infra.gmfdiag.menu.ViewRulersCommand"

-         name="Rulers Command">

-      <state

-            class="org.eclipse.jface.commands.ToggleState"

-            id="org.eclipse.ui.commands.toggleState">

-      </state>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to view the page breaks"

-         id="org.eclipse.papyrus.infra.gmfdiag.menu.ViewPageBreaksCommand"

-         name="Page breaks Command">

-      <state

-            class="org.eclipse.jface.commands.ToggleState"

-            id="org.eclipse.ui.commands.toggleState">

-      </state>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to recalculate the Page Breaks"

-         id="org.eclipse.papyrus.infra.gmfdiag.menu.RecalculatePageBreaksCommand"

-         name="Recalculate Page Breaks Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to snap to grid"

-         id="org.eclipse.papyrus.infra.gmfdiag.menu.SnapToGridCommand"

-         name="Snap To Grid Command">

-      <state

-            class="org.eclipse.papyrus.uml.diagram.menu.providers.InitTrueToggleState"

-            id="org.eclipse.ui.commands.toggleState">

-      </state>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to sort Compartments Items"

-         id="org.eclipse.papyrus.uml.diagram.menu.commands.SortFilterCompartmentItemsCommand"

-         name="Sort/Filter Compartments Items...">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="Call the Zoom In Action"

-         id="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomInCommand"

-         name="Command to Zoom In">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="Call the Zoom Out Action"

-         id="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomOutCommand"

-         name="Command to Zoom Out">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="Call the Zoom to 100% Action"

-         id="org.eclipse.papyrus.uml.diagram.menu.commands.Zoom100Command"

-         name="Command to Zoom 100%">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="Call the Zoom to Fit Action"

-         id="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomFitCommand"

-         name="Command to Zoom Fit">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="Call the Zoom to Width Action"

-         id="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomWidthCommand"

-         name="Command to Zoom Width">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="Call the Zoom to Height Action"

-         id="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomHeightCommand"

-         name="Command to Zoom Height">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="Call the Zoom Selection Action"

-         id="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomSelectionCommand"

-         name="Command to Zoom Selection">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to bring to front the selection"

-         id="org.eclipse.papyrus.uml.diagram.menu.commands.BringToFrontCommand"

-         name="Bring to front the selection">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to send to back the selection"

-         id="org.eclipse.papyrus.uml.diagram.menu.commands.SendToBackCommand"

-         name="Send to back the selection">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to bring forward the selection"

-         id="org.eclipse.papyrus.uml.diagram.menu.commands.BringForwardCommand"

-         name="Bring forward the selection">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to send backward the selection"

-         id="org.eclipse.papyrus.uml.diagram.menu.commands.SendBackwardCommand"

-         name="Send backward the selection">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to arrange all elements"

-         id="org.eclipse.papyrus.uml.diagram.menu.commands.ArrangeAllCommand"

-         name="Arrange All Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to arrange selected elements"

-         id="org.eclipse.papyrus.uml.diagram.menu.commands.ArrangeSelectionCommand"

-         name="Arrange Selection Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to select all elements"

-         id="org.eclipse.papyrus.uml.diagram.menu.commands.SelectAllCommand"

-         name="Select All Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to select all shapes"

-         id="org.eclipse.papyrus.uml.diagram.menu.commands.SelectAllShapesCommand"

-         name="Select All Shapes Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to select all connectors"

-         id="org.eclipse.papyrus.uml.diagram.menu.commands.SelectAllConnectorsCommand"

-         name="Select All Connectors Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to modify the font"

-         id="org.eclipse.papyrus.uml.diagram.menu.commands.FontCommand"

-         name="Modify the Font Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to change routing to rectilinear style for connectors"

-         id="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.rectilinear"

-         name="Rectilinear Style Routing Command">

-      <state

-            class="org.eclipse.papyrus.uml.diagram.menu.providers.RectilinearToggleState"

-            id="org.eclipse.ui.commands.toggleState">

-      </state>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to change routing to oblique style for connectors"

-         id="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.oblique"

-         name="Oblique Style Routing Command">

-      <state

-            class="org.eclipse.papyrus.uml.diagram.menu.providers.ObliqueToggleState"

-            id="org.eclipse.ui.commands.toggleState">

-      </state>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to change routing to tree style for connectors"

-         id="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.tree"

-         name="Tree Style Routing Command">

-      <state

-            class="org.eclipse.papyrus.uml.diagram.menu.providers.TreeToggleState"

-            id="org.eclipse.ui.commands.toggleState">

-      </state>

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to remove all bendpoints"

-         id="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.removebendpoint"

-         name="Remove Bendpoints Command">

-   </command>

-</extension>

-<extension

-      id="viewHandlers"

-      point="org.eclipse.ui.handlers">

-   <handler

-         class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ViewGridHandler"

-         commandId="org.eclipse.papyrus.infra.gmfdiag.menu.ViewGridCommand">

-      <activeWhen>

-         <with

-               variable="activePart">

-            <adapt

-                  type="org.eclipse.gmf.runtime.notation.Diagram">

-            </adapt>

-         </with>

-      </activeWhen>

-   </handler>

-   <handler

-         class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.RecalculatePageBreaksHandler"

-         commandId="org.eclipse.papyrus.infra.gmfdiag.menu.RecalculatePageBreaksCommand">

-      <activeWhen>

-         <with

-               variable="activePart">

-            <adapt

-                  type="org.eclipse.gmf.runtime.notation.Diagram">

-            </adapt>

-         </with>

-      </activeWhen>

-   </handler>

-   <handler

-         class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.SnapToGridHandler"

-         commandId="org.eclipse.papyrus.infra.gmfdiag.menu.SnapToGridCommand">

-      <activeWhen>

-         <with

-               variable="activePart">

-            <adapt

-                  type="org.eclipse.gmf.runtime.notation.Diagram">

-            </adapt>

-         </with>

-      </activeWhen>

-   </handler>

-   <handler

-         class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ViewPageBreaksHandler"

-         commandId="org.eclipse.papyrus.infra.gmfdiag.menu.ViewPageBreaksCommand">

-      <activeWhen>

-         <with

-               variable="activePart">

-            <adapt

-                  type="org.eclipse.gmf.runtime.notation.Diagram">

-            </adapt>

-         </with>

-      </activeWhen>

-   </handler>

-   <handler

-         class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ViewRulersHandler"

-         commandId="org.eclipse.papyrus.infra.gmfdiag.menu.ViewRulersCommand">

-      <activeWhen>

-         <with

-               variable="activePart">

-            <adapt

-                  type="org.eclipse.gmf.runtime.notation.Diagram">

-            </adapt>

-         </with>

-      </activeWhen>

-   </handler>

-   <handler

-         class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.SortFilterCompartmentItemsHandler"

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SortFilterCompartmentItemsCommand">

-      <activeWhen>

-         <and>

-            <with

-                  variable="sortFilterCompartmentItems">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomInCommand">

-      <activeWhen>

-         <and>

-            <with

-                  variable="zoom">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ZoomHandler">

-         <parameter

-               name="org.eclipse.papyrus.uml.diagram.menu.commandZoomParameter"

-               value="parameter_zoom_in">

-         </parameter>

-      </class>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomOutCommand">

-      <activeWhen>

-         <and>

-            <with

-                  variable="zoom">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ZoomHandler">

-         <parameter

-               name="org.eclipse.papyrus.uml.diagram.menu.commandZoomParameter"

-               value="parameter_zoom_out">

-         </parameter>

-      </class>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.Zoom100Command">

-      <activeWhen>

-         <and>

-            <with

-                  variable="zoom">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ZoomHandler">

-         <parameter

-               name="org.eclipse.papyrus.uml.diagram.menu.commandZoomParameter"

-               value="parameter_zoom_100">

-         </parameter>

-      </class>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomFitCommand">

-      <activeWhen>

-         <and>

-            <with

-                  variable="zoom">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ZoomHandler">

-         <parameter

-               name="org.eclipse.papyrus.uml.diagram.menu.commandZoomParameter"

-               value="parameter_zoom_fit">

-         </parameter>

-      </class>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomWidthCommand">

-      <activeWhen>

-         <and>

-            <with

-                  variable="zoom">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ZoomHandler">

-         <parameter

-               name="org.eclipse.papyrus.uml.diagram.menu.commandZoomParameter"

-               value="parameter_zoom_width">

-         </parameter>

-      </class>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomHeightCommand">

-      <activeWhen>

-         <and>

-            <with

-                  variable="zoom">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ZoomHandler">

-         <parameter

-               name="org.eclipse.papyrus.uml.diagram.menu.commandZoomParameter"

-               value="parameter_zoom_height">

-         </parameter>

-      </class>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomSelectionCommand">

-      <activeWhen>

-         <and>

-            <with

-                  variable="zoom">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ZoomHandler">

-         <parameter

-               name="org.eclipse.papyrus.uml.diagram.menu.commandZoomParameter"

-               value="parameter_zoom_selection">

-         </parameter>

-      </class>

-   </handler>

-   <handler

-         class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.SnapBackHandler"

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SnapBack">

-      <activeWhen>

-         <and>

-            <with

-                  variable="selection">

-               <iterate

-                     ifEmpty="false"

-                     operator="and">

-                  <adapt

-                        type="org.eclipse.gef.EditPart">

-                     <instanceof

-                           value="org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart">

-                     </instanceof>

-                  </adapt>

-               </iterate>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-</extension>

-<extension

-      id="update-cmd-binding"

-      point="org.eclipse.ui.bindings">

-   <key

-         commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.left"

-         contextId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"

-         schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"

-         sequence="CTRL+ARROW_LEFT">

-   </key>

-   <key

-         commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.right"

-         contextId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"

-         schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"

-         sequence="CTRL+ARROW_RIGHT">

-   </key>

-   <key

-         commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.top"

-         contextId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"

-         schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"

-         sequence="CTRL+ARROW_UP">

-   </key>

-   <key

-         commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.bottom"

-         contextId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"

-         schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"

-         sequence="CTRL+ARROW_DOWN">

-   </key>

-   <key

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideContentsCommand"

-         contextId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"

-         schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"

-         sequence="F4">

-   </key>

-   <key

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideCompartmentCommand"

-         contextId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"

-         schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"

-         sequence="CTRL+F5">

-   </key>

-   <key

-         commandId="org.eclipse.papyrus.uml.diagram.menu.command.routing.left"

-         contextId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"

-         schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"

-         sequence="CTRL+SHIFT+ARROW_LEFT">

-   </key>

-   <key

-         commandId="org.eclipse.papyrus.uml.diagram.menu.command.routing.right"

-         contextId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"

-         schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"

-         sequence="CTRL+SHIFT+ARROW_RIGHT">

-   </key>

-   <key

-         commandId="org.eclipse.papyrus.uml.diagram.menu.command.routing.top"

-         contextId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"

-         schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"

-         sequence="CTRL+SHIFT+ARROW_UP">

-   </key>

-   <key

-         commandId="org.eclipse.papyrus.uml.diagram.menu.command.routing.bottom"

-         contextId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"

-         schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"

-         sequence="CTRL+SHIFT+ARROW_DOWN">

-   </key>

-   <key

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomOutCommand"

-         contextId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"

-         schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"

-         sequence="CTRL+-">

-   </key>

-   <key

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomInCommand"

-         contextId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"

-         schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"

-         sequence="CTRL+=">

-   </key>

-   <key

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SelectAllCommand"

-         contextId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"

-         schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"

-         sequence="CTRL+A">

-   </key>

-   <key

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomInCommand"

-         contextId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"

-         schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"

-         sequence="CTRL++">

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+   <extension
+      point="org.eclipse.gmf.runtime.common.ui.services.action.contributionItemProviders">
+   <contributionItemProvider
+         checkPluginLoaded="false"
+         class="org.eclipse.papyrus.uml.diagram.menu.actions.gmf.CustomContributionItemProvider">
+      <Priority
+            name="High">
+      </Priority>
+      <!-- we rewrite this action, because the backgound of the note is black-->
+      <popupContribution
+            class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
+         <popupAction
+               id="customAddNoteLinkAction"
+               path="/diagramAddmenu/addDiagramGeneralGroup">
+         </popupAction>
+      </popupContribution>
+   </contributionItemProvider>
+</extension>
+<extension
+      id="ID:DiagramMenuDefinition"
+      name="Name:DiagramMenuDefinition"
+      point="org.eclipse.ui.menus">
+   <menuContribution
+         allPopups="false"
+         locationURI="menu:org.eclipse.ui.main.menu?after=edit">
+      <menu
+            icon="icons/papyrus.png"
+            id="org.eclipse.papyrus.uml.diagram.ui.menu"
+            label="&amp;Diagram"
+            tooltip="Diagram Menu">
+         <visibleWhen>
+            <with
+                  variable="activeEditorId">
+               <equals
+                     value="org.eclipse.papyrus.infra.core.papyrusEditor">
+               </equals>
+            </with>
+         </visibleWhen>
+      </menu>
+   </menuContribution>
+   <menuContribution
+         allPopups="false"
+         locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu?after=filtersMenu">
+      <menu
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/selectall.gif"
+            id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.select.menu"
+            label="Se&amp;lect"
+            tooltip="Select Menu">
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SelectAllCommand"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/selectall.gif"
+               id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.select.all"
+               label="&amp;All"
+               style="push"
+               tooltip="Select All">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SelectAllShapesCommand"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/selectshapes.gif"
+               id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.select.all.shapes"
+               label="All &amp;Shapes"
+               style="push"
+               tooltip="Select All Shapes">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SelectAllConnectorsCommand"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/selectconnectors.gif"
+               id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.select.all.connectors"
+               label="All &amp;Connectors"
+               style="push"
+               tooltip="Select All Connectors">
+         </command>
+         <visibleWhen
+               checkEnabled="true">
+            <and>
+               <with
+                     variable="activeEditorId">
+                  <equals
+                        value="org.eclipse.papyrus.infra.core.papyrusEditor">
+                  </equals>
+               </with>
+               <with
+                     variable="selection">
+                  <and>
+                     <count
+                           value="1">
+                     </count>
+                     <iterate>
+                        <instanceof
+                              value="org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart">
+                        </instanceof>
+                     </iterate>
+                  </and>
+               </with>
+            </and>
+         </visibleWhen>
+      </menu>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ArrangeAllCommand"
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/arrangeall.gif"
+            id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.arrange.all"
+            label="Arran&amp;ge All"
+            style="push"
+            tooltip="Arrange All">
+         <visibleWhen
+               checkEnabled="true">
+            <and>
+               <with
+                     variable="activeEditorId">
+                  <equals
+                        value="org.eclipse.papyrus.infra.core.papyrusEditor">
+                  </equals>
+               </with>
+               <with
+                     variable="selection">
+                  <and>
+                     <count
+                           value="1">
+                     </count>
+                     <iterate>
+                        <instanceof
+                              value="org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart">
+                        </instanceof>
+                     </iterate>
+                  </and>
+               </with>
+            </and>
+         </visibleWhen>
+      </command>
+      <menu
+            icon="icons/papyrus.png"
+            id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.format"
+            label="For&amp;mat"
+            tooltip="Papyrus Format Menu">
+         <visibleWhen>
+            <with
+                  variable="activeEditorId">
+               <equals
+                     value="org.eclipse.papyrus.infra.core.papyrusEditor">
+               </equals>
+            </with>
+         </visibleWhen>
+      </menu>
+      <menu
+            icon="icons/papyrus.png"
+            id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.filters"
+            label="F&amp;ilters"
+            tooltip="Papyrus Filters Menu">
+         <visibleWhen>
+            <with
+                  variable="activeEditorId">
+               <equals
+                     value="org.eclipse.papyrus.infra.core.papyrusEditor">
+               </equals>
+            </with>
+         </visibleWhen>
+      </menu>
+      <separator
+            name="org.eclipse.papyrus.uml.diagram.ui.popupmenu.filters.end.separator">
+      </separator>
+   </menuContribution>
+   <menuContribution
+         allPopups="false"
+         locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu?after=endFilterMenu">
+      <menu
+            icon="icons/papyrus.png"
+            id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.view"
+            label="&amp;View"
+            tooltip="Papyrus View Menu">
+         <visibleWhen>
+            <with
+                  variable="activeEditorId">
+               <equals
+                     value="org.eclipse.papyrus.infra.core.papyrusEditor">
+               </equals>
+            </with>
+         </visibleWhen>
+      </menu>
+      <menu
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.providers/icons/zoomplus.gif"
+            id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.zoom"
+            label="&amp;Zoom"
+            tooltip="Zoom Menu">
+         <visibleWhen>
+            <with
+                  variable="activeEditorId">
+               <equals
+                     value="org.eclipse.papyrus.infra.core.papyrusEditor">
+               </equals>
+            </with>
+         </visibleWhen>
+      </menu>
+   </menuContribution>
+   <menuContribution
+         locationURI="toolbar:org.eclipse.ui.main.toolbar?after=org.eclipse.papyrus.uml.diagram.ui.toolbar">
+      <toolbar
+            id="org.eclipes.papyrus.menu.toolbar"
+            label="Papyrus Toolbar Action">
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.toolbar.command"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_style_group.gif"
+               id="org.eclipse.papyrus.menu.line.style.toolbar.command"
+               style="pulldown"
+               tooltip="Line Style Action">
+            <visibleWhen>
+               <and>
+                  <with
+                        variable="activeEditorId">
+                     <equals
+                           value="org.eclipse.papyrus.infra.core.papyrusEditor">
+                     </equals>
+                  </with>
+               </and>
+            </visibleWhen>
+         </command>
+         <separator
+               name="org.eclipse.papyrus.uml.diagram.menu.toolbar.separator0"
+               visible="true">
+         </separator>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.CopyAppearancePropertiesCommand"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/copy_appearance_properties.gif"
+               label="Apply Appearance &amp;Properties"
+               style="push"
+               tooltip="Apply the applicable appearance properties of the last selected shape to the other selected shapes.">
+            <visibleWhen>
+               <and>
+                  <with
+                        variable="activeEditorId">
+                     <equals
+                           value="org.eclipse.papyrus.infra.core.papyrusEditor">
+                     </equals>
+                  </with>
+               </and>
+            </visibleWhen>
+         </command>
+         <separator
+               name="org.eclipse.papyrus.uml.diagram.menu.toolbar.separator1"
+               visible="true">
+         </separator>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.toolbar.command"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/selectall.gif"
+               id="org.eclipse.papyrus.menu.select.toolbar.command"
+               style="pulldown"
+               tooltip="Select Actions">
+            <visibleWhen>
+               <and>
+                  <with
+                        variable="activeEditorId">
+                     <equals
+                           value="org.eclipse.papyrus.infra.core.papyrusEditor">
+                     </equals>
+                  </with>
+               </and>
+            </visibleWhen>
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.toolbar.command"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/arrangeall.gif"
+               id="org.eclipse.papyrus.menu.arrange.toolbar.command"
+               style="pulldown"
+               tooltip="Arrange Actions">
+            <visibleWhen>
+               <and>
+                  <with
+                        variable="activeEditorId">
+                     <equals
+                           value="org.eclipse.papyrus.infra.core.papyrusEditor">
+                     </equals>
+                  </with>
+               </and>
+            </visibleWhen>
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.toolbar.command"
+               icon="icons/alignleft.gif"
+               id="org.eclipse.papyrus.menu.alignment.toolbar.command"
+               style="pulldown"
+               tooltip="Alignment Actions">
+            <visibleWhen>
+               <and>
+                  <with
+                        variable="activeEditorId">
+                     <equals
+                           value="org.eclipse.papyrus.infra.core.papyrusEditor">
+                     </equals>
+                  </with>
+               </and>
+            </visibleWhen>
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.toolbar.command"
+               icon="icons/fantom.gif"
+               id="org.eclipse.papyrus.menu.showhide.toolbar.command"
+               style="pulldown"
+               tooltip="Show/Hide Actions">
+            <visibleWhen>
+               <and>
+                  <with
+                        variable="activeEditorId">
+                     <equals
+                           value="org.eclipse.papyrus.infra.core.papyrusEditor">
+                     </equals>
+                  </with>
+               </and>
+            </visibleWhen>
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.toolbar.command"
+               icon="icons/horizontal_by_left.gif"
+               id="org.eclipse.papyrus.menu.routing.toolbar.command"
+               style="pulldown"
+               tooltip="Routing Actions">
+            <visibleWhen>
+               <and>
+                  <with
+                        variable="activeEditorId">
+                     <equals
+                           value="org.eclipse.papyrus.infra.core.papyrusEditor">
+                     </equals>
+                  </with>
+               </and>
+            </visibleWhen>
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.toolbar.command"
+               icon="icons/distribute_horizontally.gif"
+               id="org.eclipse.papyrus.menu.distribute.toolbar.command"
+               style="pulldown"
+               tooltip="Distribute Actions">
+            <visibleWhen>
+               <and>
+                  <with
+                        variable="activeEditorId">
+                     <equals
+                           value="org.eclipse.papyrus.infra.core.papyrusEditor">
+                     </equals>
+                  </with>
+               </and>
+            </visibleWhen>
+         </command>
+         <separator
+               name="org.eclipse.papyrus.uml.diagram.menu.toolbar.separator2"
+               visible="true">
+         </separator>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SnapBack"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/snapback.gif"
+               label="&amp;Snap Back"
+               style="push"
+               tooltip="Reset the element to its initial location">
+            <visibleWhen
+                  checkEnabled="false">
+               <with
+                     variable="activeEditorId">
+                  <equals
+                        value="org.eclipse.papyrus.infra.core.papyrusEditor">
+                  </equals>
+               </with>
+            </visibleWhen>
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.command.autosize"
+               icon="icons/autosize.gif"
+               style="push"
+               tooltip="Auto Size">
+            <visibleWhen>
+               <and>
+                  <with
+                        variable="activeEditorId">
+                     <equals
+                           value="org.eclipse.papyrus.infra.core.papyrusEditor">
+                     </equals>
+                  </with>
+               </and>
+            </visibleWhen>
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.toolbar.same.size.command"
+               icon="icons/size_to_control.gif"
+               id="org.eclipse.papyrus.menu.size.toolbar.command"
+               style="pulldown"
+               tooltip="Make Same Size">
+            <visibleWhen>
+               <and>
+                  <with
+                        variable="activeEditorId">
+                     <equals
+                           value="org.eclipse.papyrus.infra.core.papyrusEditor">
+                     </equals>
+                  </with>
+               </and>
+            </visibleWhen>
+         </command>
+                  <dynamic
+               class="org.eclipse.papyrus.uml.diagram.menu.toolbar.ZoomToolbar"
+               id="zoomToolBar">
+            <visibleWhen
+                  checkEnabled="true">
+               <and>
+                  <with
+                  variable="activeEditorId">
+                     <equals
+                           value="org.eclipse.papyrus.infra.core.papyrusEditor">
+                     </equals>
+                  </with>
+               </and>
+            </visibleWhen>
+         </dynamic>
+         <visibleWhen>
+            <with
+                  variable="activeEditorId">
+               <equals
+                     value="org.eclipse.papyrus.infra.core.papyrusEditor">
+               </equals>
+            </with>
+         </visibleWhen>
+      </toolbar>
+   </menuContribution>
+</extension>
+<extension
+      point="org.eclipse.ui.menus">
+   <menuContribution
+         locationURI="menu:org.eclipse.papyrus.menu.line.style.toolbar.command">
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.rectilinear"
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/rectilinear.gif"
+            id="org.eclipse.papyrus.menu.line.style.toolbar.rectilinear"
+            label="&amp;Rectilinear Style Routing"
+            style="toggle"
+            tooltip="Change routing to rectilinear style for connectors">
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.oblique"
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/oblique.gif"
+            id="org.eclipse.papyrus.menu.line.style.toolbar.oblique"
+            label="&amp;Oblique Style Routing"
+            style="toggle"
+            tooltip="Change routing to oblique style for connectors">
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.tree"
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/tree.gif"
+            id="org.eclipse.papyrus.menu.line.style.toolbar.tree"
+            label="&amp;Tree Style Routing"
+            style="toggle"
+            tooltip="Change routing to tree style for connectors">
+      </command>
+      <separator
+            name="org.eclipse.papyrus.menu.line.style.toolbar.separator0"
+            visible="true">
+      </separator>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.removebendpoint"
+            icon="icons/no_bendpoints.gif"
+            id="org.eclipse.papyrus.menu.line.style.toolbar.no.bendpoint"
+            label="Remove &amp;all bendpoints"
+            style="push"
+            tooltip="Remove all bendpoints on the selected connectors">
+      </command>
+   </menuContribution>
+   <menuContribution
+         locationURI="menu:org.eclipse.papyrus.menu.select.toolbar.command">
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SelectAllCommand"
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/selectall.gif"
+            label="Select &amp;All"
+            style="push"
+            tooltip="Select All">
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SelectAllShapesCommand"
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/selectshapes.gif"
+            label="Select All &amp;Shapes"
+            style="push"
+            tooltip="Select All Shapes">
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SelectAllConnectorsCommand"
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/selectconnectors.gif"
+            label="Select All &amp;Connectors"
+            style="push"
+            tooltip="Select All Connectors">
+      </command>
+   </menuContribution>
+   <menuContribution
+         locationURI="menu:org.eclipse.papyrus.menu.arrange.toolbar.command">
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ArrangeAllCommand"
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/arrangeall.gif"
+            label="Arran&amp;ge All"
+            style="push"
+            tooltip="Arrange All">
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ArrangeSelectionCommand"
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/arrangeselected.gif"
+            label="Arrange &amp;Selection"
+            style="push"
+            tooltip="Arrange Selection">
+      </command>
+   </menuContribution>
+   <menuContribution
+         locationURI="menu:org.eclipse.papyrus.menu.alignment.toolbar.command">
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.left"
+            icon="icons/alignleft.gif"
+            label="Align &amp;Left"
+            style="push">
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.center"
+            icon="icons/aligncenter.gif"
+            label="Align &amp;Center"
+            style="push">
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.right"
+            icon="icons/alignright.gif"
+            label="Align &amp;Right"
+            style="push">
+      </command>
+      <separator
+            name="org.eclipse.papyrus.uml.diagram.menu.alignment.pulldown.separator"
+            visible="true">
+      </separator>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.bottom"
+            icon="icons/alignbottom.gif"
+            label="Align &amp;Bottom"
+            style="push">
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.middle"
+            icon="icons/alignmid.gif"
+            label="Align &amp;Middle"
+
+            style="push">
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.top"
+            icon="icons/aligntop.gif"
+            label="Align &amp;Top"
+            style="push">
+      </command>
+   </menuContribution>
+   <menuContribution
+         locationURI="menu:org.eclipse.papyrus.menu.showhide.toolbar.command">
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideContentsCommand"
+            icon="icons/fantomContents.gif"
+            label="Show/Hide &amp;Contents"
+            style="push"
+            tooltip="The Show/Hide Contents Action">
+         <visibleWhen>
+            <and>
+               <with
+                     variable="activeEditorId">
+                  <equals
+                        value="org.eclipse.papyrus.infra.core.papyrusEditor">
+                  </equals>
+               </with>
+            </and>
+         </visibleWhen>
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideCompartmentCommand"
+            icon="icons/fantomCompartment.gif"
+            label="Show/Hide Com&amp;partments"
+            style="push"
+            tooltip="The Show/Hide Compartments Action">
+         <visibleWhen>
+            <and>
+               <with
+                     variable="activeEditorId">
+                  <equals
+                        value="org.eclipse.papyrus.infra.core.papyrusEditor">
+                  </equals>
+               </with>
+            </and>
+         </visibleWhen>
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideRelatedLinkCommand"
+            style="push">
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowRelatedLinkBetweenSelectedElementsCommand"
+            style="push">
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowAllRelatedLinkCommand"
+            style="push">
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SortFilterCompartmentItemsCommand"
+            helpContextId="ActionToolTipText"
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/sortfilter.gif"
+            label="Sort/&amp;Filter Compartments Items..."
+            style="push"
+            tooltip="Sort or Filter Compartments Items for this shape">
+         <visibleWhen>
+            <and>
+               <with
+                     variable="activeEditorId">
+                  <equals
+                        value="org.eclipse.papyrus.infra.core.papyrusEditor">
+                  </equals>
+               </with>
+            </and>
+         </visibleWhen>
+      </command>
+      <separator
+            name="org.eclipse.papyrus.menu.showhide.toolbar.separator0"
+            visible="true">
+      </separator>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.link.label.show.all"
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/showconnector.gif"
+            id="org.eclipse.papyrus.menu.showhide.toolbar.all.connector.label"
+            label="&amp;All Connector Labels"
+            style="push"
+            tooltip="Display all labels on the selected connectors">
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.link.label.hide.all"
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/hideconnector.gif"
+            id="org.eclipse.papyrus.menu.showhide.toolbar.no.connector.label"
+            label="N&amp;o Connector Labels"
+            style="push"
+            tooltip="Hide all labels on the selected Connections">
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.link.label.manager"
+            icon="icons/manage_connector_label.gif"
+            id="org.eclipse.papyrus.menu.showhide.toolbar.manage.connector.label"
+            label="&amp;Manage Connector Labels"
+            style="push"
+            tooltip="Manage the labels to display for the selected connections">
+      </command>
+   </menuContribution>
+   <menuContribution
+         locationURI="menu:org.eclipse.papyrus.menu.routing.toolbar.command">
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.command.routing.left"
+            icon="icons/horizontal_by_left.gif"
+            label="Set Horizontal By &amp;Left"
+            style="push">
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.command.routing.right"
+            icon="icons/horizontal_by_right.gif"
+            label="Set Horizontal By &amp;Right"
+            style="push">
+      </command>
+      <separator
+            name="org.eclipse.papyrus.uml.diagram.menu.routing.pulldown.separator"
+            visible="true">
+      </separator>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.command.routing.top"
+            icon="icons/vertical_by_top.gif"
+            label="Set Vertical By &amp;Top"
+            style="push">
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.command.routing.bottom"
+            icon="icons/vertical_by_bottom.gif"
+            label="Set Vertical By &amp;Bottom"
+            style="push">
+      </command>
+   </menuContribution>
+   <menuContribution
+         locationURI="menu:org.eclipse.papyrus.menu.distribute.toolbar.command">
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.command.distribute.horizontally"
+            icon="icons/distribute_horizontally.gif"
+            label="Distribute Nodes/Links &amp;Horizontally"
+            style="push">
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.command.distribute.horizontally_between_nodesly"
+            icon="icons/distribute_horizontally_between_nodes.gif"
+            label="Distribute Nodes/Links H&amp;orizontally Between 2 Nodes"
+            style="push">
+      </command>
+      <separator
+            name="org.eclipse.papyrus.uml.diagram.menu.distribute.pulldown.separator"
+            visible="true">
+      </separator>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.command.distribute.vertically"
+            icon="icons/distibute_vertically.gif"
+            label="Distribute Nodes/Links &amp;Vertically"
+            style="push">
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.command.distribute.vertically_between_nodes"
+            icon="icons/distribute_vertically_between_nodes.gif"
+            label="Distribute Nodes/Links V&amp;ertically Between 2 Nodes"
+            style="push">
+      </command>
+   </menuContribution>
+   <menuContribution
+         locationURI="menu:org.eclipse.papyrus.menu.size.toolbar.command">
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.command.sameSize.both"
+            icon="icons/size_to_control.gif"
+            label="&amp;Both"
+            style="push"
+            tooltip="Set the dimension of the last selected element">
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.command.sameSize.height"
+            icon="icons/size_to_control_height.gif"
+            label="&amp;Height"
+            style="push"
+            tooltip="Set the height of the last selected element">
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.command.sameSize.width"
+            icon="icons/size_to_control_width.gif"
+            label="&amp;Width"
+            style="push"
+            tooltip="Set the width of the last selected element">
+      </command>
+   </menuContribution>
+</extension>
+<extension
+      point="org.eclipse.ui.menus">
+   <menuContribution
+         allPopups="false"
+         locationURI="menu:org.eclipse.papyrus.uml.diagram.ui.menu">
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.FontCommand"
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/font_color.gif"
+            label="&amp;Font..."
+            style="push"
+            tooltip="Font">
+         <visibleWhen
+               checkEnabled="false">
+         </visibleWhen>
+      </command>
+      <menu
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/fill_color.gif"
+            label="Fill &amp;Color"
+            tooltip="Fill Color">
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.white.command"
+                            icon="icons/colors/white.gif"
+               label="White"
+               style="push"
+               tooltip="White">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.black.command"
+               icon="icons/colors/black.gif"
+               label="Black"
+               style="push"
+               tooltip="Black">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.lightgray.command"
+               icon="icons/colors/light_gray.gif"
+               label="Light Gray"
+               style="push"
+               tooltip="Light Gray">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.gray.command"
+               icon="icons/colors/gray.gif"
+               label="Gray"
+               style="push"
+               tooltip="Gray">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.darkgray.command"
+               icon="icons/colors/dark_gray.gif"
+               label="Dark Gray"
+               style="push"
+               tooltip="Dark Gray">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.red.command"
+               icon="icons/colors/red.gif"
+               label="Red"
+               style="push"
+               tooltip="Red">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.green.command"
+               icon="icons/colors/green.gif"
+               label="Green"
+               style="push"
+               tooltip="Green">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.blue.command"
+               icon="icons/colors/blue.gif"
+               label="Blue"
+               style="push"
+               tooltip="Blue">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.yellow.command"
+               icon="icons/colors/yellow.gif"
+               label="Yellow"
+               style="push"
+               tooltip="Yellow">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.magenta.command"
+               icon="icons/colors/magenta.gif"
+               label="Magenta"
+               style="push"
+               tooltip="Magenta">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.cyan.command"
+               icon="icons/colors/cyan.gif"
+               label="Cyan"
+               style="push"
+               tooltip="Cyan">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.pink.command"
+               icon="icons/colors/pink.gif"
+               label="Pink"
+               style="push"
+               tooltip="Pink">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.orange.command"
+               icon="icons/colors/orange.gif"
+               label="Orange"
+               style="push"
+               tooltip="Orange">
+         </command>
+         <separator
+               name="org.eclipse.papyrus.uml.diagram.menu.fill.color.separator"
+               visible="true">
+         </separator>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.defaultcolor.command"
+               label="&amp;Default Color"
+               style="push"
+               tooltip="Default Colors">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.morecolors.command"
+               label="&amp;More colors..."
+               style="push"
+               tooltip="More Colors">
+         </command>
+      </menu>
+      <menu
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_color.gif"
+            label="Li&amp;ne Color"
+            tooltip="Line Color">
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.white.command"
+               icon="icons/colors/white.gif"
+               label="White"
+               style="push"
+               tooltip="White">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.black.command"
+               icon="icons/colors/black.gif"
+               label="Black"
+               style="push"
+               tooltip="Black">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.lightgray.command"
+               icon="icons/colors/light_gray.gif"
+               label="Light Gray"
+               style="push"
+               tooltip="Light Gray">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.gray.command"
+               icon="icons/colors/gray.gif"
+               label="Gray"
+               style="push"
+               tooltip="Gray">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.darkgray.command"
+               icon="icons/colors/dark_gray.gif"
+               label="Dark Gray"
+               style="push"
+               tooltip="Dark Gray">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.red.command"
+               icon="icons/colors/red.gif"
+               label="Red"
+               style="push"
+               tooltip="Red">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.green.command"
+               icon="icons/colors/green.gif"
+               label="Green"
+               style="push"
+               tooltip="Green">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.blue.command"
+               icon="icons/colors/blue.gif"
+               label="Blue"
+               style="push"
+               tooltip="Blue">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.yellow.command"
+               icon="icons/colors/yellow.gif"
+               label="Yellow"
+               style="push"
+               tooltip="Yellow">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.magenta.command"
+               icon="icons/colors/magenta.gif"
+               label="Magenta"
+               style="push"
+               tooltip="Magenta">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.cyan.command"
+               icon="icons/colors/cyan.gif"
+               label="Cyan"
+               style="push"
+               tooltip="Cyan">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.pink.command"
+               icon="icons/colors/pink.gif"
+               label="Pink"
+               style="push"
+               tooltip="Pink">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.orange.command"
+               icon="icons/colors/orange.gif"
+               label="Orange"
+               style="push"
+               tooltip="Orange">
+         </command>
+         <separator
+               name="org.eclipse.papyrus.uml.diagram.menu.line.color.separator"
+               visible="true">
+         </separator>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.defaultcolor.command"
+               label="&amp;Default Color"
+               style="push"
+               tooltip="Default Colors">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.morecolors.command"
+               label="&amp;More colors..."
+               style="push"
+               tooltip="More Colors">
+         </command>
+      </menu>
+      <menu
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_style_group.gif"
+            id="org.eclipse.papyrus.uml.diagram.ui.menu.line.style.menu"
+            label="Line &amp;Style"
+            tooltip="Line Style">
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.rectilinear"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/rectilinear.gif"
+               id="org.eclipse.papyrus.uml.diagram.ui.menu.line.style.rectilinear"
+               label="&amp;Rectilinear Style Routing"
+               style="toggle"
+               tooltip="Change routing to rectilinear style for connectors">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.oblique"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/oblique.gif"
+               id="org.eclipse.papyrus.uml.diagram.ui.menu.line.style.oblique"
+               label="&amp;Oblique Style Routing"
+               style="toggle"
+               tooltip="Change routing to oblique style for connectors">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.tree"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/tree.gif"
+               id="org.eclipse.papyrus.uml.diagram.ui.menu.line.style.tree"
+               label="&amp;Tree Style Routing"
+               style="toggle"
+               tooltip="Change routing to tree style for connectors">
+         </command>
+         <separator
+               name="org.eclipse.papyrus.uml.diagram.ui.menu.line.style.separator0"
+               visible="true">
+         </separator>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.removebendpoint"
+               icon="icons/no_bendpoints.gif"
+               id="org.eclipse.papyrus.uml.diagram.ui.menu.line.style.no.bendpoint"
+               label="Remove &amp;all bendpoints"
+               style="push"
+               tooltip="Remove all bendpoints on the selected connectors">
+         </command>
+      </menu>
+      <separator
+            name="org.eclipse.papyrus.uml.diagram.menu.separator0"
+            visible="true">
+      </separator>
+      <menu
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/selectall.gif"
+            label="Se&amp;lect"
+            tooltip="Select Menu">
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SelectAllCommand"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/selectall.gif"
+               label="&amp;All"
+               style="push"
+               tooltip="Select All">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SelectAllShapesCommand"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/selectshapes.gif"
+               label="All &amp;Shapes"
+               style="push"
+               tooltip="Select All Shapes">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SelectAllConnectorsCommand"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/selectconnectors.gif"
+               label="All &amp;Connectors"
+               style="push"
+               tooltip="Select All Connectors">
+         </command>
+      </menu>
+      <menu
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/arrangeall.gif"
+            label="A&amp;rrange"
+            tooltip="Arrange Menu">
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ArrangeAllCommand"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/arrangeall.gif"
+               label="&amp;All"
+               style="push"
+               tooltip="Arrange All">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ArrangeSelectionCommand"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/arrangeselected.gif"
+               label="&amp;Selection"
+               style="push"
+               tooltip="Arrange Selection">
+         </command>
+      </menu>
+      <menu
+            icon="icons/alignleft.gif"
+            id="org.eclipse.papyrus.uml.diagram.ui.menu.alignMenu"
+            label="Ali&amp;gnment"
+            tooltip="Alignement Menu">
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.left"
+               icon="icons/alignleft.gif"
+               label="Align &amp;Left"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.center"
+               icon="icons/aligncenter.gif"
+               label="Align &amp;Center"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.right"
+               icon="icons/alignright.gif"
+               label="Align &amp;Right"
+               style="push">
+         </command>
+         <separator
+               name="org.eclipse.papyrus.uml.diagram.papyrus.alignment.menu.separator"
+               visible="true">
+         </separator>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.bottom"
+               icon="icons/alignbottom.gif"
+               label="Align &amp;Bottom"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.middle"
+               icon="icons/alignmid.gif"
+               label="Align &amp;Middle"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.top"
+               icon="icons/aligntop.gif"
+               label="Align &amp;Top"
+               style="push">
+         </command>
+      </menu>
+      <menu
+            icon="icons/horizontal_by_left.gif"
+            id="org.eclipse.papyrus.uml.diagram.ui.menu.routingMenu"
+            label="&amp;Routing"
+            tooltip="Routing Menu">
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.command.routing.left"
+               icon="icons/horizontal_by_left.gif"
+               label="Set Horizontal By &amp;Left"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.command.routing.right"
+               icon="icons/horizontal_by_right.gif"
+               label="Set Horizontal By &amp;Right"
+               style="push">
+         </command>
+         <separator
+               name="org.eclipse.papyrus.uml.diagram.papyrus.menu.separator1"
+               visible="true">
+         </separator>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.command.routing.top"
+               icon="icons/vertical_by_top.gif"
+               label="Set Vertical By &amp;Top"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.command.routing.bottom"
+               icon="icons/vertical_by_bottom.gif"
+               label="Set Vertical By &amp;Bottom"
+               style="push">
+         </command>
+      </menu>
+      <menu
+            icon="icons/distribute_horizontally.gif"
+            id="org.eclipse.papyrus.uml.diagram.ui.menu.distributeMenu"
+            label="&amp;Distribution"
+            tooltip="Distribute Menu">
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.command.distribute.horizontally"
+               icon="icons/distribute_horizontally.gif"
+               label="Distribute Nodes/Links &amp;Horizontally"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.command.distribute.horizontally_between_nodesly"
+               icon="icons/distribute_horizontally_between_nodes.gif"
+               label="Distribute Nodes/Links H&amp;orizontally Between 2 Nodes"
+               style="push">
+         </command>
+         <separator
+               name="org.eclipse.papyrus.uml.diagram.menu.distribute.menu.separator"
+               visible="true">
+         </separator>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.command.distribute.vertically"
+               icon="icons/distibute_vertically.gif"
+               label="Distribute Nodes/Links &amp;Vertically"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.command.distribute.vertically_between_nodes"
+               icon="icons/distribute_vertically_between_nodes.gif"
+               label="Distribute Nodes/Links V&amp;ertically Between 2 Nodes"
+               style="push">
+         </command>
+      </menu>
+      <menu
+            label="&amp;Order"
+            tooltip="Order">
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.BringToFrontCommand"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/bring_to_front.gif"
+               label="Bring To &amp;Front"
+               style="push"
+               tooltip="Bring To Front">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SendToBackCommand"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/send_to_back.gif"
+               label="Send To &amp;Back"
+               style="push"
+               tooltip="Send To Back">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.BringForwardCommand"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/bring_forward.gif"
+               label="Bring F&amp;orward"
+               style="push"
+               tooltip="Bring Forward">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SendBackwardCommand"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/send_backward.gif"
+               label="Send B&amp;ackward"
+               style="push"
+               tooltip="Send Backward">
+         </command>
+      </menu>
+      <separator
+            name="org.eclipse.papyrus.uml.diagram.menu.separator1"
+            visible="true">
+      </separator>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SnapBack"
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/snapback.gif"
+            label="&amp;Snap Back"
+            style="push"
+            tooltip="Reset the element to its initial location">
+         <visibleWhen
+               checkEnabled="false">
+            <with
+                  variable="activeEditorId">
+               <equals
+                     value="org.eclipse.papyrus.infra.core.papyrusEditor">
+               </equals>
+            </with>
+         </visibleWhen>
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.command.autosize"
+            icon="icons/autosize.gif"
+            label="&amp;Auto Size"
+            style="push"
+            tooltip="Auto Size">
+      </command>
+      <menu
+            icon="icons/size_to_control.gif"
+            id="org.eclipse.papyrus.uml.diagram.ui.menu.sameSizeMenu"
+            label="&amp;Make Same Size"
+            tooltip="Make Same Size Menu">
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.command.sameSize.both"
+               icon="icons/size_to_control.gif"
+               label="&amp;Both"
+               style="push"
+               tooltip="Set the dimension of the last selected element">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.command.sameSize.height"
+               icon="icons/size_to_control_height.gif"
+               label="&amp;Height"
+               style="push"
+               tooltip="Set the height of the last selected element">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.command.sameSize.width"
+               icon="icons/size_to_control_width.gif"
+               label="&amp;Width"
+               style="push"
+               tooltip="Set the width of the last selected element">
+         </command>
+      </menu>
+      <separator
+            name="org.eclipse.papyrus.uml.diagram.menu.separator2"
+            visible="true">
+      </separator>
+      <menu
+            icon="icons/fantom.gif"
+            id="org.eclipse.papyrus.uml.diagram.ui.menu.filtersMenu"
+            label="&amp;Filters"
+            tooltip="Filters Menu">
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideContentsCommand"
+               icon="icons/fantomContents.gif"
+               id="showh"
+               label="Show/Hide &amp;Contents"
+               style="push"
+               tooltip="The Show/Hide Contents Action">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideCompartmentCommand"
+               icon="icons/fantomCompartment.gif"
+               label="Show/Hide &amp;Compartments"
+               style="push"
+               tooltip="The Show/Hide Compartments Action">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideRelatedLinkCommand"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowRelatedLinkBetweenSelectedElementsCommand"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideRelatedLinkCommand"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SortFilterCompartmentItemsCommand"
+               helpContextId="ActionToolTipText"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/sortfilter.gif"
+               label="Sort/&amp;Filter Compartments Items..."
+               style="push"
+               tooltip="Sort or Filter Compartments Items for this shape">
+         </command>
+         <separator
+               name="org.eclipse.papyrus.uml.diagram.ui.menu.filtersMenu.separator0"
+               visible="true">
+         </separator>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.link.label.show.all"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/showconnector.gif"
+               id="org.eclipse.papyrus.uml.diagram.ui.menu.filtersMenu.all.connector.label"
+               label="&amp;All Connector Labels"
+               style="push"
+               tooltip="Display all labels on the selected connectors">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.link.label.hide.all"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/hideconnector.gif"
+               id="org.eclipse.papyrus.uml.diagram.ui.menu.filtersMenu.no.connector.label"
+               label="N&amp;o Connector Labels"
+               style="push"
+               tooltip="Hide all labels on the selected Connections">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.link.label.manager"
+               icon="icons/manage_connector_label.gif"
+               id="org.eclipse.papyrus.uml.diagram.ui.menu.filtersMenu.manage.connector.label"
+               label="&amp;Manage Connector Labels"
+               style="push"
+               tooltip="Manage the labels to display for the selected connections">
+         </command>
+      </menu>
+      <separator
+            name="org.eclipse.papyrus.uml.diagram.menu.separator3"
+            visible="true">
+      </separator>
+      <menu
+            label="&amp;View"
+            tooltip="This Menu provides Action for the View">
+         <command
+               commandId="org.eclipse.papyrus.infra.gmfdiag.menu.ViewGridCommand"
+               label="&amp;Grid"
+               style="toggle"
+               tooltip="Toggle the grid lines on the diagram">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.infra.gmfdiag.menu.ViewRulersCommand"
+               label="&amp;Rulers"
+               style="toggle"
+               tooltip="Toggle the rulers on the diagram">
+         </command>
+         <separator
+               name="org.eclipse.papyrus.uml.diagram.menu.view.separator"
+               visible="true">
+         </separator>
+         <command
+               commandId="org.eclipse.papyrus.infra.gmfdiag.menu.ViewPageBreaksCommand"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/viewpagebreaks.gif"
+               label="&amp;Page Breaks"
+               style="toggle"
+               tooltip="Show the page breaks on the diagram">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.infra.gmfdiag.menu.RecalculatePageBreaksCommand"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/recalcpagebreaks.gif"
+               label="&amp;Recalculate Page Breaks"
+               style="push"
+               tooltip="Recalculate Page Breaks">
+         </command>
+         <separator
+               name="org.eclipse.papyrus.uml.diagram.menu.view.separator1"
+               visible="true">
+         </separator>
+         <command
+               commandId="org.eclipse.papyrus.infra.gmfdiag.menu.SnapToGridCommand"
+               label="&amp;Snap to Grid"
+               style="toggle"
+               tooltip="Toggle Snap to Grid">
+         </command>
+      </menu>
+       <menu
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.providers/icons/zoomplus.gif"
+            id="org.eclipse.papyrus.uml.diagram.ui.menu.zoomMenu"
+            label="&amp;Zoom"
+            tooltip="Zoom Menu">
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomInCommand"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/zoomplus.gif"
+               label="Zoom &amp;In"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomOutCommand"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/zoomminus.gif"
+               label="Zoom &amp;Out"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.Zoom100Command"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/zoom100.gif"
+               label="Zoom &amp;to 100%"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomFitCommand"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/zoomtofit.gif"
+               label="Zoom to &amp;Fit"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomWidthCommand"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/zoomtofit.gif"
+               label="Fit to &amp;Width"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomHeightCommand"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/zoomtofit.gif"
+               label="Fit to &amp;Height"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomSelectionCommand"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/zoomtofit.gif"
+               label="Fit to &amp;Selection"
+               style="push">
+         </command>
+      </menu>
+      <separator
+            name="org.eclipse.papyrus.uml.diagram.menu.separator4"
+            visible="true">
+      </separator>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.CopyAppearancePropertiesCommand"
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/copy_appearance_properties.gif"
+            label="Apply Appearance &amp;Properties"
+            style="push"
+            tooltip="Apply the applicable appearance properties of the last selected shape to the other selected shapes.">
+         <visibleWhen>
+            <and>
+               <with
+                     variable="activeEditorId">
+                  <equals
+                        value="org.eclipse.papyrus.infra.core.papyrusEditor">
+                  </equals>
+               </with>
+            </and>
+         </visibleWhen>
+      </command>
+   </menuContribution>
+</extension>
+<extension
+      point="org.eclipse.ui.menus">
+   <menuContribution
+         allPopups="false"
+         locationURI="popup:org.eclipse.papyrus.uml.diagram.ui.popupmenu.format">
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.FontCommand"
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/font_color.gif"
+            label="&amp;Font..."
+            style="push"
+            tooltip="Font">
+         <visibleWhen
+               checkEnabled="false">
+         </visibleWhen>
+      </command>
+      <menu
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/fill_color.gif"
+            label="Fill &amp;Color"
+            tooltip="Fill Color">
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.white.command"
+               icon="icons/colors/white.gif"
+               label="White"
+               style="push"
+               tooltip="White">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.black.command"
+               icon="icons/colors/black.gif"
+               label="Black"
+               style="push"
+               tooltip="Black">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.lightgray.command"
+               icon="icons/colors/light_gray.gif"
+               label="Light Gray"
+               style="push"
+               tooltip="Light Gray">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.gray.command"
+               icon="icons/colors/gray.gif"
+               label="Gray"
+               style="push"
+               tooltip="Gray">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.darkgray.command"
+               icon="icons/colors/dark_gray.gif"
+               label="Dark Gray"
+               style="push"
+               tooltip="Dark Gray">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.red.command"
+               icon="icons/colors/red.gif"
+               label="Red"
+               style="push"
+               tooltip="Red">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.green.command"
+               icon="icons/colors/green.gif"
+               label="Green"
+               style="push"
+               tooltip="Green">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.blue.command"
+               icon="icons/colors/blue.gif"
+               label="Blue"
+               style="push"
+               tooltip="Blue">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.yellow.command"
+               icon="icons/colors/yellow.gif"
+               label="Yellow"
+               style="push"
+               tooltip="Yellow">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.magenta.command"
+               icon="icons/colors/magenta.gif"
+               label="Magenta"
+               style="push"
+               tooltip="Magenta">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.cyan.command"
+               icon="icons/colors/cyan.gif"
+               label="Cyan"
+               style="push"
+               tooltip="Cyan">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.pink.command"
+               icon="icons/colors/pink.gif"
+               label="Pink"
+               style="push"
+               tooltip="Pink">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.orange.command"
+               icon="icons/colors/orange.gif"
+               label="Orange"
+               style="push"
+               tooltip="Orange">
+         </command>
+         <separator
+               name="org.eclipse.papyrus.uml.diagram.menu.fill.color.separator"
+               visible="true">
+         </separator>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.defaultcolor.command"
+               label="&amp;Default Color"
+               style="push"
+               tooltip="Default Colors">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.morecolors.command"
+               label="&amp;More colors..."
+               style="push"
+               tooltip="More Colors">
+         </command>
+      </menu>
+      <menu
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_color.gif"
+            label="Li&amp;ne Color"
+            tooltip="Line Color">
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.white.command"
+               icon="icons/colors/white.gif"
+               label="White"
+               style="push"
+               tooltip="White">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.black.command"
+               icon="icons/colors/black.gif"
+               label="Black"
+               style="push"
+               tooltip="Black">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.lightgray.command"
+               icon="icons/colors/light_gray.gif"
+               label="Light Gray"
+               style="push"
+               tooltip="Light Gray">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.gray.command"
+               icon="icons/colors/gray.gif"
+               label="Gray"
+               style="push"
+               tooltip="Gray">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.darkgray.command"
+               icon="icons/colors/dark_gray.gif"
+               label="Dark Gray"
+               style="push"
+               tooltip="Dark Gray">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.red.command"
+               icon="icons/colors/red.gif"
+               label="Red"
+               style="push"
+               tooltip="Red">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.green.command"
+               icon="icons/colors/green.gif"
+               label="Green"
+               style="push"
+               tooltip="Green">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.blue.command"
+               icon="icons/colors/blue.gif"
+               label="Blue"
+               style="push"
+               tooltip="Blue">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.yellow.command"
+               icon="icons/colors/yellow.gif"
+               label="Yellow"
+               style="push"
+               tooltip="Yellow">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.magenta.command"
+               icon="icons/colors/magenta.gif"
+               label="Magenta"
+               style="push"
+               tooltip="Magenta">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.cyan.command"
+               icon="icons/colors/cyan.gif"
+               label="Cyan"
+               style="push"
+               tooltip="Cyan">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.pink.command"
+               icon="icons/colors/pink.gif"
+               label="Pink"
+               style="push"
+               tooltip="Pink">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.orange.command"
+               icon="icons/colors/orange.gif"
+               label="Orange"
+               style="push"
+               tooltip="Orange">
+         </command>
+         <separator
+               name="org.eclipse.papyrus.uml.diagram.menu.line.color.separator"
+               visible="true">
+         </separator>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.defaultcolor.command"
+               label="&amp;Default Color"
+               style="push"
+               tooltip="Default Colors">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.morecolors.command"
+               label="&amp;More colors..."
+               style="push"
+               tooltip="More Colors">
+         </command>
+      </menu>
+      <menu
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_style_group.gif"
+            id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.format.line.style.menu"
+            label="Line &amp;Style"
+            tooltip="Line Style">
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.rectilinear"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/rectilinear.gif"
+               id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.format.line.style.rectilinear"
+               label="&amp;Rectilinear Style Routing"
+               style="toggle"
+               tooltip="Change routing to rectilinear style for connectors">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.oblique"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/oblique.gif"
+               id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.format.line.style.oblique"
+               label="&amp;Oblique Style Routing"
+               style="toggle"
+               tooltip="Change routing to oblique style for connectors">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.tree"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/tree.gif"
+               id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.format.line.style.tree"
+               label="&amp;Tree Style Routing"
+               style="toggle"
+               tooltip="Change routing to tree style for connectors">
+         </command>
+         <separator
+               name="org.eclipse.papyrus.uml.diagram.ui.popupmenu.format.line.style.separator0"
+               visible="true">
+         </separator>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.removebendpoint"
+               icon="icons/no_bendpoints.gif"
+               id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.format.line.style.no.bendpoint"
+               label="Remove &amp;all bendpoints"
+               style="push"
+               tooltip="Remove all bendpoints on the selected connectors">
+         </command>
+      </menu>
+      <separator
+            name="org.eclipse.papyrus.uml.diagram.menu.popup.separator0"
+            visible="true">
+      </separator>
+      <menu
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/arrangeall.gif"
+            label="A&amp;rrange"
+            tooltip="Arrange Menu">
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ArrangeAllCommand"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/arrangeall.gif"
+               label="&amp;All"
+               style="push"
+               tooltip="Arrange All">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ArrangeSelectionCommand"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/arrangeselected.gif"
+               label="&amp;Selection"
+               style="push"
+               tooltip="Arrange Selection">
+         </command>
+      </menu>
+      <menu
+            icon="icons/alignleft.gif"
+            id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.format.alignMenu"
+            label="Ali&amp;gnment"
+            tooltip="Alignement Menu">
+         mmand>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.left"
+               icon="icons/alignleft.gif"
+               label="Align &amp;Left"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.center"
+               icon="icons/aligncenter.gif"
+               label="Align &amp;Center"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.right"
+               icon="icons/alignright.gif"
+               label="Align &amp;Right"
+               style="push">
+         </command>
+         <separator
+               name="org.eclipse.papyrus.uml.diagram.papyrus.alignment.popup.separator"
+               visible="true">
+         </separator>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.bottom"
+               icon="icons/alignbottom.gif"
+               label="Align &amp;Bottom"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.middle"
+               icon="icons/alignmid.gif"
+               label="Align &amp;Middle"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.top"
+               icon="icons/aligntop.gif"
+               label="Align &amp;Top"
+               style="push">
+         </command>
+      </menu>
+      <menu
+            icon="icons/horizontal_by_left.gif"
+            id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.format.routingMenu"
+            label="&amp;Routing"
+            tooltip="Routing Menu">
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.command.routing.left"
+               icon="icons/horizontal_by_left.gif"
+               label="Set Horizontal By &amp;Left"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.command.routing.right"
+               icon="icons/horizontal_by_right.gif"
+               label="Set Horizontal By &amp;Right"
+               style="push">
+         </command>
+         <separator
+               name="org.eclipse.papyrus.uml.diagram.menu.routing.popup.separator"
+               visible="true">
+         </separator>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.command.routing.top"
+               icon="icons/vertical_by_top.gif"
+               label="Set Vertical By &amp;Top"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.command.routing.bottom"
+               icon="icons/vertical_by_bottom.gif"
+               label="Set Vertical By &amp;Bottom"
+               style="push">
+         </command>
+      </menu>
+      <menu
+            icon="icons/distribute_horizontally.gif"
+            id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.format.distributeMenu"
+            label="&amp;Distribution"
+            tooltip="Distribute Menu">
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.command.distribute.horizontally"
+               icon="icons/distribute_horizontally.gif"
+               label="Distribute Nodes/Links &amp;Horizontally"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.command.distribute.horizontally_between_nodesly"
+               icon="icons/distribute_horizontally_between_nodes.gif"
+               label="Distribute Nodes/Links H&amp;orizontally Between 2 Nodes"
+               style="push">
+         </command>
+         <separator
+               name="org.eclipse.papyrus.uml.diagram.menu.distribute.popup.separator"
+               visible="true">
+         </separator>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.command.distribute.vertically"
+               icon="icons/distibute_vertically.gif"
+               label="Distribute Nodes/Links &amp;Vertically"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.command.distribute.vertically_between_nodes"
+               icon="icons/distribute_vertically_between_nodes.gif"
+               label="Distribute Nodes/Links V&amp;ertically Between 2 Nodes"
+               style="push">
+         </command>
+      </menu>
+      <menu
+            label="&amp;Order"
+            tooltip="Order">
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.BringToFrontCommand"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/bring_to_front.gif"
+               label="Bring To &amp;Front"
+               style="push"
+               tooltip="Bring To Front">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SendToBackCommand"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/send_to_back.gif"
+               label="Send To &amp;Back"
+               style="push"
+               tooltip="Send To Back">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.BringForwardCommand"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/bring_forward.gif"
+               label="Bring F&amp;orward"
+               style="push"
+               tooltip="Bring Forward">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SendBackwardCommand"
+               icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/send_backward.gif"
+               label="Send B&amp;ackward"
+               style="push"
+               tooltip="Send Backward">
+         </command>
+      </menu>
+      <separator
+            name="org.eclipse.papyrus.uml.diagram.menu.popup.separator1"
+            visible="true">
+      </separator>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SnapBack"
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/snapback.gif"
+            label="&amp;Snap Back"
+            style="push"
+            tooltip="Reset the element to its initial location">
+         <visibleWhen
+               checkEnabled="false">
+            <with
+                  variable="activeEditorId">
+               <equals
+                     value="org.eclipse.papyrus.infra.core.papyrusEditor">
+               </equals>
+            </with>
+         </visibleWhen>
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.command.autosize"
+            icon="icons/autosize.gif"
+            label="&amp;Autozise"
+            style="push"
+            tooltip="Auto Size">
+         <visibleWhen>
+            <and>
+               <with
+                     variable="activeEditorId">
+                  <equals
+                        value="org.eclipse.papyrus.infra.core.papyrusEditor">
+                  </equals>
+               </with>
+            </and>
+         </visibleWhen>
+      </command>
+      <menu
+            icon="icons/size_to_control.gif"
+            id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.format.sameSizeMenu"
+            label="&amp;Make Same Size"
+            tooltip="Make Same Size Menu">
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.command.sameSize.both"
+               icon="icons/size_to_control.gif"
+               label="&amp;Both"
+               style="push"
+               tooltip="Set the dimension of the last selected element">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.command.sameSize.height"
+               icon="icons/size_to_control_height.gif"
+               label="&amp;Height"
+               style="push"
+               tooltip="Set the height of the last selected element">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.uml.diagram.menu.command.sameSize.width"
+               icon="icons/size_to_control_width.gif"
+               label="&amp;Width"
+               style="push"
+               tooltip="Set the width of the last selected element">
+         </command>
+      </menu>
+      <separator
+            name="org.eclipse.papyrus.uml.diagram.menu.popup.separator2"
+            visible="true">
+      </separator>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.CopyAppearancePropertiesCommand"
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/copy_appearance_properties.gif"
+            label="Apply Appearance &amp;Properties"
+            style="push"
+            tooltip="Apply the applicable appearance properties of the last selected shape to the other selected shapes.">
+         <visibleWhen>
+            <and>
+               <with
+                     variable="activeEditorId">
+                  <equals
+                        value="org.eclipse.papyrus.infra.core.papyrusEditor">
+                  </equals>
+               </with>
+            </and>
+         </visibleWhen>
+      </command>
+   </menuContribution>
+   <menuContribution
+         allPopups="false"
+         locationURI="popup:org.eclipse.papyrus.uml.diagram.ui.popupmenu.filters">
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideContentsCommand"
+            icon="icons/fantomContents.gif"
+            id="showhidecontents.popup"
+            label="Show/Hide &amp;Contents"
+            style="push"
+            tooltip="The Show/Hide Contents Action">
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideCompartmentCommand"
+            icon="icons/fantomCompartment.gif"
+            id="showhidecompartments.popup"
+            label="Show/Hide Com&amp;partments"
+            style="push"
+            tooltip="The Show/Hide Compartments Action">
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideRelatedLinkCommand"
+            style="push">
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowRelatedLinkBetweenSelectedElementsCommand"
+            style="push">
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowAllRelatedLinkCommand"
+            style="push">
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SortFilterCompartmentItemsCommand"
+            helpContextId="ActionToolTipText"
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/sortfilter.gif"
+            label="Sort/&amp;Filter Compartments Items..."
+            style="push"
+            tooltip="Sort or Filter Compartments Items for this shape">
+      </command>
+      <separator
+            name="org.eclipse.papyrus.uml.diagram.ui.popupmenu.filters.separator0"
+            visible="true">
+      </separator>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.link.label.show.all"
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/showconnector.gif"
+            id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.filters.all.connector.label"
+            label="&amp;All Connector Labels"
+            style="push"
+            tooltip="Display all labels on the selected connectors">
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.link.label.hide.all"
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/hideconnector.gif"
+            id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.filters.no.connector.label"
+            label="N&amp;o Connector Labels"
+            style="push"
+            tooltip="Hide all labels on the selected Connections">
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.link.label.manager"
+            icon="icons/manage_connector_label.gif"
+            id="org.eclipse.papyrus.uml.diagram.ui.popupmenu.filters.manage.connector.label"
+            label="&amp;Manage Connector Labels"
+            style="push"
+            tooltip="Manage the labels to display for the selected connections">
+      </command>
+   </menuContribution>
+   <menuContribution
+         allPopups="false"
+         locationURI="popup:org.eclipse.papyrus.uml.diagram.ui.popupmenu.view">
+      <command
+            commandId="org.eclipse.papyrus.infra.gmfdiag.menu.ViewGridCommand"
+            label="&amp;Grid"
+            style="toggle"
+            tooltip="Toggle the grid lines on the diagram">
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.infra.gmfdiag.menu.ViewRulersCommand"
+            label="&amp;Rulers"
+            style="toggle"
+            tooltip="Toggle the rulers on the diagram">
+      </command>
+      <separator
+            name="org.eclipse.papyrus.uml.diagram.menu.popup.view.separator1"
+            visible="true">
+      </separator>
+      <command
+            commandId="org.eclipse.papyrus.infra.gmfdiag.menu.ViewPageBreaksCommand"
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/viewpagebreaks.gif"
+            label="&amp;Page Breaks"
+            style="toggle"
+            tooltip="Show the page breaks on the diagram">
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.infra.gmfdiag.menu.RecalculatePageBreaksCommand"
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/recalcpagebreaks.gif"
+            label="&amp;Recalculate Page Breaks"
+            style="push"
+            tooltip="Recalculate Page Breaks">
+      </command>
+      <separator
+            name="org.eclipse.papyrus.uml.diagram.menu.popup.view.separator2"
+            visible="true">
+      </separator>
+      <command
+            commandId="org.eclipse.papyrus.infra.gmfdiag.menu.SnapToGridCommand"
+            label="Snap to &amp;Grid"
+            style="toggle"
+            tooltip="Toggle Snap to Grid">
+      </command>
+   </menuContribution>
+   <menuContribution
+         allPopups="false"
+         locationURI="popup:org.eclipse.papyrus.uml.diagram.ui.popupmenu.zoom">
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomInCommand"
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/zoomplus.gif"
+            label="Zoom &amp;In"
+            style="push">
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomOutCommand"
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/zoomminus.gif"
+            label="Zoom &amp;Out"
+            style="push">
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.Zoom100Command"
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/zoom100.gif"
+            label="Zoom &amp;to 100%"
+            style="push">
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomFitCommand"
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/zoomtofit.gif"
+            label="Zoom to &amp;Fit"
+            style="push">
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomWidthCommand"
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/zoomtofit.gif"
+            label="Fit to &amp;Width"
+            style="push">
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomHeightCommand"
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/zoomtofit.gif"
+            label="Fit to &amp;Heightight"
+            style="push">
+      </command>
+      <command
+            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomSelectionCommand"
+            icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/zoomtofit.gif"
+            label="Fit to &amp;Selection"
+            style="push">
+      </command>
+   </menuContribution>
+</extension>
+<extension
+      point="org.eclipse.ui.commands">
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         defaultHandler="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.DropDownToolBarHandler"
+         id="org.eclipse.papyrus.uml.diagram.menu.toolbar.command"
+         name="Command for the toolbar actions">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         defaultHandler="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.DropDownToolBarSameSizeHandler"
+         id="org.eclipse.papyrus.uml.diagram.menu.toolbar.same.size.command"
+         name="Command for the Make Same Size Toolbar actions">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="Call the Routing By Left Action"
+         id="org.eclipse.papyrus.uml.diagram.menu.command.routing.left"
+         name="Routing By Left Command">
+      <defaultHandler
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.RoutingHandler">
+         <parameter
+               name="org.eclipse.papyrus.uml.diagram.menu.commandRoutingParameter"
+               value="parameter_left">
+         </parameter>
+      </defaultHandler>
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="Call the Routing By Right Action"
+         id="org.eclipse.papyrus.uml.diagram.menu.command.routing.right"
+         name="Routing By Righ Command">
+      <defaultHandler
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.RoutingHandler">
+         <parameter
+               name="org.eclipse.papyrus.uml.diagram.menu.commandRoutingParameter"
+               value="parameter_right">
+         </parameter>
+      </defaultHandler>
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="Call the Routing By Top Action"
+         id="org.eclipse.papyrus.uml.diagram.menu.command.routing.top"
+         name="Routing By Top Command">
+      <defaultHandler
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.RoutingHandler">
+         <parameter
+               name="org.eclipse.papyrus.uml.diagram.menu.commandRoutingParameter"
+               value="parameter_top">
+         </parameter>
+      </defaultHandler>
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="Call the Routing By Bottom Action"
+         id="org.eclipse.papyrus.uml.diagram.menu.command.routing.bottom"
+         name="Routing By Bottom Command">
+      <defaultHandler
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.RoutingHandler">
+         <parameter
+               name="org.eclipse.papyrus.uml.diagram.menu.commandRoutingParameter"
+               value="parameter_bottom">
+         </parameter>
+      </defaultHandler>
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="Call the Distribute Nodes/Links Figure Horizontally"
+         id="org.eclipse.papyrus.uml.diagram.menu.command.distribute.horizontally"
+         name="Distribute Nodes/Links horizontally">
+      <defaultHandler
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.DistributionHandler">
+         <parameter
+               name="org.eclipse.papyrus.uml.diagram.menu.commandDistributionParameter"
+               value="parameter_horizontally">
+         </parameter>
+      </defaultHandler>
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="Call the Distribute Nodes/Links Horizontally Between 2 Nodes"
+         id="org.eclipse.papyrus.uml.diagram.menu.command.distribute.horizontally_between_nodesly"
+         name="Distribute Nodes/Links Horizontally Between 2 Nodes">
+      <defaultHandler
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.DistributionHandler">
+         <parameter
+               name="org.eclipse.papyrus.uml.diagram.menu.commandDistributionParameter"
+               value="parameter_horizontally_between_nodes">
+         </parameter>
+      </defaultHandler>
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="Call the Distribute Nodes/Links Vertically"
+         id="org.eclipse.papyrus.uml.diagram.menu.command.distribute.vertically"
+         name="Distribute Nodes/Links Vertically">
+      <defaultHandler
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.DistributionHandler">
+         <parameter
+               name="org.eclipse.papyrus.uml.diagram.menu.commandDistributionParameter"
+               value="parameter_vertically">
+         </parameter>
+      </defaultHandler>
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="Call the Distribute Nodes/Links Vertically Between 2 Nodes"
+         id="org.eclipse.papyrus.uml.diagram.menu.command.distribute.vertically_between_nodes"
+         name="Distribute Nodes/Links Vertically Between 2 Nodes">
+      <defaultHandler
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.DistributionHandler">
+         <parameter
+               name="org.eclipse.papyrus.uml.diagram.menu.commandDistributionParameter"
+               value="parameter_vertically_between_nodes">
+         </parameter>
+      </defaultHandler>
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="Call the Align on Left Command"
+         id="org.eclipse.papyrus.uml.diagram.menu.command.alignment.left"
+         name="Align Left Command">
+      <defaultHandler
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.AlignementHandler">
+         <parameter
+               name="org.eclipse.papyrus.uml.diagram.menu.commandAlignmentParameter"
+               value="parameter_left">
+         </parameter>
+      </defaultHandler>
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="Call the Align on Center Command"
+         id="org.eclipse.papyrus.uml.diagram.menu.command.alignment.center"
+         name="Align Center Command">
+      <defaultHandler
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.AlignementHandler">
+         <parameter
+               name="org.eclipse.papyrus.uml.diagram.menu.commandAlignmentParameter"
+               value="parameter_center">
+         </parameter>
+      </defaultHandler>
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="Call the Align on Right Command"
+         id="org.eclipse.papyrus.uml.diagram.menu.command.alignment.right"
+         name="Align Right Command">
+      <defaultHandler
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.AlignementHandler">
+         <parameter
+               name="org.eclipse.papyrus.uml.diagram.menu.commandAlignmentParameter"
+               value="parameter_right">
+         </parameter>
+      </defaultHandler>
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="Call the Align on Bottom Command"
+         id="org.eclipse.papyrus.uml.diagram.menu.command.alignment.bottom"
+         name="Align Bottom Command">
+      <defaultHandler
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.AlignementHandler">
+         <parameter
+               name="org.eclipse.papyrus.uml.diagram.menu.commandAlignmentParameter"
+               value="parameter_bottom">
+         </parameter>
+      </defaultHandler>
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="Call the Align on Middle Command"
+         id="org.eclipse.papyrus.uml.diagram.menu.command.alignment.middle"
+         name="Align Middle Command">
+      <defaultHandler
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.AlignementHandler">
+         <parameter
+               name="org.eclipse.papyrus.uml.diagram.menu.commandAlignmentParameter"
+               value="parameter_middle">
+         </parameter>
+      </defaultHandler>
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="Call the Align on Top Command"
+         id="org.eclipse.papyrus.uml.diagram.menu.command.alignment.top"
+         name="Align Top Command">
+      <defaultHandler
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.AlignementHandler">
+         <parameter
+               name="org.eclipse.papyrus.uml.diagram.menu.commandAlignmentParameter"
+               value="parameter_top">
+         </parameter>
+      </defaultHandler>
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="Call the Make Same Size Both Action"
+         id="org.eclipse.papyrus.uml.diagram.menu.command.sameSize.both"
+         name="Make Same Size Both">
+      <defaultHandler
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.SizeHandler">
+         <parameter
+               name="org.eclipse.papyrus.uml.diagram.menu.commandSizeParameter"
+               value="parameter_both">
+         </parameter>
+      </defaultHandler>
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="Call the Make Same Size Height Action"
+         id="org.eclipse.papyrus.uml.diagram.menu.command.sameSize.height"
+         name="Make Same Height">
+      <defaultHandler
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.SizeHandler">
+         <parameter
+               name="org.eclipse.papyrus.uml.diagram.menu.commandSizeParameter"
+               value="parameter_height">
+         </parameter>
+      </defaultHandler>
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="Call the Make Width Size Action"
+         id="org.eclipse.papyrus.uml.diagram.menu.command.sameSize.width"
+         name="Make Same Width Both">
+      <defaultHandler
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.SizeHandler">
+         <parameter
+               name="org.eclipse.papyrus.uml.diagram.menu.commandSizeParameter"
+               value="parameter_width">
+         </parameter>
+      </defaultHandler>
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="Call the Auto Size Action"
+         id="org.eclipse.papyrus.uml.diagram.menu.command.autosize"
+         name="Auto Size">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="Call the Show/Hide Compartments Action"
+         id="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideCompartmentCommand"
+         name="Show/Hide Compartments Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="Call the Show/Hide Contents Action"
+         id="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideContentsCommand"
+         name="Show/Hide Contents Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+          description="Call the Show/Hide Related Link Action"
+         id="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideRelatedLinkCommand"
+         name="Show/Hide Related Link">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="Call the Show/Hide Related Link In Selection Action"
+         id="org.eclipse.papyrus.uml.diagram.menu.commands.ShowRelatedLinkBetweenSelectedElementsCommand"
+         name="Show Related Link In Selection">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="Call the Show All Related Link Action"
+         id="org.eclipse.papyrus.uml.diagram.menu.commands.ShowAllRelatedLinkCommand"
+         name="Show All Related Link">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="Copy the appearance properties"
+         id="org.eclipse.papyrus.uml.diagram.menu.commands.CopyAppearancePropertiesCommand"
+         name="Copy Appearance Properties Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="Call the Command  to manage the displayed label on links"
+         id="org.eclipse.papyrus.uml.diagram.menu.commands.link.label.manager"
+         name="Manage Displayed Labels Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="Call the Command to show all labels on links"
+         id="org.eclipse.papyrus.uml.diagram.menu.commands.link.label.show.all"
+         name="Show all labels on links">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="Call the Command to hide all labels on links"
+         id="org.eclipse.papyrus.uml.diagram.menu.commands.link.label.hide.all"
+         name="Hide all labels on links">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="Reset the label to its initial location"
+         id="org.eclipse.papyrus.uml.diagram.menu.commands.SnapBack"
+         name="Snap Back">
+   </command>
+</extension>
+<extension
+      id="viewCommands"
+      point="org.eclipse.ui.commands">
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to view the Grid"
+         id="org.eclipse.papyrus.infra.gmfdiag.menu.ViewGridCommand"
+         name="Grid Command">
+      <state
+            class="org.eclipse.jface.commands.ToggleState"
+            id="org.eclipse.ui.commands.toggleState">
+      </state>
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to view the Rulers"
+         id="org.eclipse.papyrus.infra.gmfdiag.menu.ViewRulersCommand"
+         name="Rulers Command">
+      <state
+            class="org.eclipse.jface.commands.ToggleState"
+            id="org.eclipse.ui.commands.toggleState">
+      </state>
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to view the page breaks"
+         id="org.eclipse.papyrus.infra.gmfdiag.menu.ViewPageBreaksCommand"
+         name="Page breaks Command">
+      <state
+            class="org.eclipse.jface.commands.ToggleState"
+            id="org.eclipse.ui.commands.toggleState">
+      </state>
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to recalculate the Page Breaks"
+         id="org.eclipse.papyrus.infra.gmfdiag.menu.RecalculatePageBreaksCommand"
+         name="Recalculate Page Breaks Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to snap to grid"
+         id="org.eclipse.papyrus.infra.gmfdiag.menu.SnapToGridCommand"
+         name="Snap To Grid Command">
+      <state
+            class="org.eclipse.papyrus.uml.diagram.menu.providers.InitTrueToggleState"
+            id="org.eclipse.ui.commands.toggleState">
+      </state>
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to sort Compartments Items"
+         id="org.eclipse.papyrus.uml.diagram.menu.commands.SortFilterCompartmentItemsCommand"
+         name="Sort/Filter Compartments Items...">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="Call the Zoom In Action"
+         id="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomInCommand"
+         name="Command to Zoom In">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="Call the Zoom Out Action"
+         id="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomOutCommand"
+         name="Command to Zoom Out">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="Call the Zoom to 100% Action"
+         id="org.eclipse.papyrus.uml.diagram.menu.commands.Zoom100Command"
+         name="Command to Zoom 100%">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="Call the Zoom to Fit Action"
+         id="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomFitCommand"
+         name="Command to Zoom Fit">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="Call the Zoom to Width Action"
+         id="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomWidthCommand"
+         name="Command to Zoom Width">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="Call the Zoom to Height Action"
+         id="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomHeightCommand"
+         name="Command to Zoom Height">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="Call the Zoom Selection Action"
+         id="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomSelectionCommand"
+         name="Command to Zoom Selection">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to bring to front the selection"
+         id="org.eclipse.papyrus.uml.diagram.menu.commands.BringToFrontCommand"
+         name="Bring to front the selection">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to send to back the selection"
+         id="org.eclipse.papyrus.uml.diagram.menu.commands.SendToBackCommand"
+         name="Send to back the selection">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to bring forward the selection"
+         id="org.eclipse.papyrus.uml.diagram.menu.commands.BringForwardCommand"
+         name="Bring forward the selection">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to send backward the selection"
+         id="org.eclipse.papyrus.uml.diagram.menu.commands.SendBackwardCommand"
+         name="Send backward the selection">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to arrange all elements"
+         id="org.eclipse.papyrus.uml.diagram.menu.commands.ArrangeAllCommand"
+         name="Arrange All Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to arrange selected elements"
+         id="org.eclipse.papyrus.uml.diagram.menu.commands.ArrangeSelectionCommand"
+         name="Arrange Selection Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to select all elements"
+         id="org.eclipse.papyrus.uml.diagram.menu.commands.SelectAllCommand"
+         name="Select All Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to select all shapes"
+         id="org.eclipse.papyrus.uml.diagram.menu.commands.SelectAllShapesCommand"
+         name="Select All Shapes Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to select all connectors"
+         id="org.eclipse.papyrus.uml.diagram.menu.commands.SelectAllConnectorsCommand"
+         name="Select All Connectors Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to modify the font"
+         id="org.eclipse.papyrus.uml.diagram.menu.commands.FontCommand"
+         name="Modify the Font Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to change routing to rectilinear style for connectors"
+         id="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.rectilinear"
+         name="Rectilinear Style Routing Command">
+      <state
+            class="org.eclipse.papyrus.uml.diagram.menu.providers.RectilinearToggleState"
+            id="org.eclipse.ui.commands.toggleState">
+      </state>
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to change routing to oblique style for connectors"
+         id="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.oblique"
+         name="Oblique Style Routing Command">
+      <state
+            class="org.eclipse.papyrus.uml.diagram.menu.providers.ObliqueToggleState"
+            id="org.eclipse.ui.commands.toggleState">
+      </state>
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to change routing to tree style for connectors"
+         id="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.tree"
+         name="Tree Style Routing Command">
+      <state
+            class="org.eclipse.papyrus.uml.diagram.menu.providers.TreeToggleState"
+            id="org.eclipse.ui.commands.toggleState">
+      </state>
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to remove all bendpoints"
+         id="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.removebendpoint"
+         name="Remove Bendpoints Command">
+   </command>
+</extension>
+<extension
+      id="viewHandlers"
+      point="org.eclipse.ui.handlers">
+   <handler
+         class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ViewGridHandler"
+         commandId="org.eclipse.papyrus.infra.gmfdiag.menu.ViewGridCommand">
+      <activeWhen>
+         <with
+               variable="activePart">
+            <adapt
+                  type="org.eclipse.gmf.runtime.notation.Diagram">
+            </adapt>
+         </with>
+      </activeWhen>
+   </handler>
+   <handler
+         class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.RecalculatePageBreaksHandler"
+         commandId="org.eclipse.papyrus.infra.gmfdiag.menu.RecalculatePageBreaksCommand">
+      <activeWhen>
+         <with
+               variable="activePart">
+            <adapt
+                  type="org.eclipse.gmf.runtime.notation.Diagram">
+            </adapt>
+         </with>
+      </activeWhen>
+   </handler>
+   <handler
+         class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.SnapToGridHandler"
+         commandId="org.eclipse.papyrus.infra.gmfdiag.menu.SnapToGridCommand">
+      <activeWhen>
+         <with
+               variable="activePart">
+            <adapt
+                  type="org.eclipse.gmf.runtime.notation.Diagram">
+            </adapt>
+         </with>
+      </activeWhen>
+   </handler>
+   <handler
+         class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ViewPageBreaksHandler"
+         commandId="org.eclipse.papyrus.infra.gmfdiag.menu.ViewPageBreaksCommand">
+      <activeWhen>
+         <with
+               variable="activePart">
+            <adapt
+                  type="org.eclipse.gmf.runtime.notation.Diagram">
+            </adapt>
+         </with>
+      </activeWhen>
+   </handler>
+   <handler
+         class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ViewRulersHandler"
+         commandId="org.eclipse.papyrus.infra.gmfdiag.menu.ViewRulersCommand">
+      <activeWhen>
+         <with
+               variable="activePart">
+            <adapt
+                  type="org.eclipse.gmf.runtime.notation.Diagram">
+            </adapt>
+         </with>
+      </activeWhen>
+   </handler>
+   <handler
+         class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.SortFilterCompartmentItemsHandler"
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SortFilterCompartmentItemsCommand">
+      <activeWhen>
+         <and>
+            <with
+                  variable="sortFilterCompartmentItems">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomInCommand">
+      <activeWhen>
+         <and>
+            <with
+                  variable="zoom">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ZoomHandler">
+         <parameter
+               name="org.eclipse.papyrus.uml.diagram.menu.commandZoomParameter"
+               value="parameter_zoom_in">
+         </parameter>
+      </class>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomOutCommand">
+      <activeWhen>
+         <and>
+            <with
+                  variable="zoom">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ZoomHandler">
+         <parameter
+               name="org.eclipse.papyrus.uml.diagram.menu.commandZoomParameter"
+               value="parameter_zoom_out">
+         </parameter>
+      </class>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.Zoom100Command">
+      <activeWhen>
+         <and>
+            <with
+                  variable="zoom">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ZoomHandler">
+         <parameter
+               name="org.eclipse.papyrus.uml.diagram.menu.commandZoomParameter"
+               value="parameter_zoom_100">
+         </parameter>
+      </class>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomFitCommand">
+      <activeWhen>
+         <and>
+            <with
+                  variable="zoom">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ZoomHandler">
+         <parameter
+               name="org.eclipse.papyrus.uml.diagram.menu.commandZoomParameter"
+               value="parameter_zoom_fit">
+         </parameter>
+      </class>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomWidthCommand">
+      <activeWhen>
+         <and>
+            <with
+                  variable="zoom">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ZoomHandler">
+         <parameter
+               name="org.eclipse.papyrus.uml.diagram.menu.commandZoomParameter"
+               value="parameter_zoom_width">
+         </parameter>
+      </class>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomHeightCommand">
+      <activeWhen>
+         <and>
+            <with
+                  variable="zoom">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ZoomHandler">
+         <parameter
+               name="org.eclipse.papyrus.uml.diagram.menu.commandZoomParameter"
+               value="parameter_zoom_height">
+         </parameter>
+      </class>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomSelectionCommand">
+      <activeWhen>
+         <and>
+            <with
+                  variable="zoom">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ZoomHandler">
+         <parameter
+               name="org.eclipse.papyrus.uml.diagram.menu.commandZoomParameter"
+               value="parameter_zoom_selection">
+         </parameter>
+      </class>
+   </handler>
+   <handler
+         class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.SnapBackHandler"
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SnapBack">
+      <activeWhen>
+         <and>
+            <with
+                  variable="selection">
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.gef.EditPart">
+                     <instanceof
+                           value="org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart">
+                     </instanceof>
+                  </adapt>
+               </iterate>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+</extension>
+<extension
+      id="update-cmd-binding"
+      point="org.eclipse.ui.bindings">
+   <key
+         commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.left"
+         contextId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"
+         schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+         sequence="CTRL+ARROW_LEFT">
+   </key>
+   <key
+         commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.right"
+         contextId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"
+         schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+         sequence="CTRL+ARROW_RIGHT">
+   </key>
+   <key
+         commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.top"
+         contextId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"
+         schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+         sequence="CTRL+ARROW_UP">
+   </key>
+   <key
+         commandId="org.eclipse.papyrus.uml.diagram.menu.command.alignment.bottom"
+         contextId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"
+         schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+         sequence="CTRL+ARROW_DOWN">
+   </key>
+   <key
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideContentsCommand"
+         contextId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"
+         schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+         sequence="F4">
+   </key>
+   <key
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideCompartmentCommand"
+         contextId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"
+         schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+         sequence="CTRL+F5">
+   </key>
+   <key
+         commandId="org.eclipse.papyrus.uml.diagram.menu.command.routing.left"
+         contextId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"
+         schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+         sequence="CTRL+SHIFT+ARROW_LEFT">
    </key>
+   <key
+         commandId="org.eclipse.papyrus.uml.diagram.menu.command.routing.right"
+         contextId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"
+         schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+         sequence="CTRL+SHIFT+ARROW_RIGHT">
+   </key>
+   <key
+         commandId="org.eclipse.papyrus.uml.diagram.menu.command.routing.top"
+         contextId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"
+         schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+         sequence="CTRL+SHIFT+ARROW_UP">
+   </key>
+   <key
+         commandId="org.eclipse.papyrus.uml.diagram.menu.command.routing.bottom"
+         contextId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"
+         schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+         sequence="CTRL+SHIFT+ARROW_DOWN">
+   </key>
+   <key
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomOutCommand"
+         contextId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"
+         schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+         sequence="CTRL+-">
+   </key>
+   <key
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomInCommand"
+         contextId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"
+         schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+         sequence="CTRL+=">
+   </key>
+   <key
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SelectAllCommand"
+         contextId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"
+         schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+         sequence="CTRL+A">
+   </key>
+   <key
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ZoomInCommand"
+         contextId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"
+         schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+         sequence="CTRL++">
+   </key>
+</extension>
+<extension
+      point="org.eclipse.ui.handlers">
+   <handler
+         class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.SizeHandler"
+         commandId="org.eclipse.papyrus.uml.diagram.menu.command.autosize">
+      <enabledWhen>
+         <iterate>
+            <instanceof
+                  value="org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart">
+            </instanceof>
+            <and>
+               <not>
+                  <instanceof
+                        value="org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart">
+                  </instanceof>
+               </not>
+            </and>
+         </iterate>
+      </enabledWhen>
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.SizeHandler">
+         <parameter
+               name="org.eclipse.papyrus.uml.diagram.menu.commandSizeParameter"
+               value="parameter_autosize">
+         </parameter>
+      </class>
+   </handler>
+   <handler
+         class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ShowHideContentsHandler"
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideContentsCommand">
+      <activeWhen>
+         <and>
+            <with
+                  variable="showHideContents">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ShowHideCompartmentHandler"
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideCompartmentCommand">
+      <activeWhen>
+         <and>
+            <with
+                  variable="showHideCompartments">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideRelatedLinkCommand">
+      <activeWhen>
+         <and>
+            <with
+                  variable="selection">
+               <test
+                     args="ShowHideRelatedLinkEditPolicy"
+                     property="org.eclipse.papyrus.uml.diagram.menu.tester.hasRequiredEditPolicy"
+                     value="true">
+               </test>
+            </with>
+         </and>
+      </activeWhen>
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ShowHideRelatedLinkHandler">
+         <parameter
+               name="showHideRelatedLinkParameter"
+               value="OPEN_DIALOG">
+         </parameter>
+      </class>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowRelatedLinkBetweenSelectedElementsCommand">
+      <activeWhen>
+         <and>
+            <with
+                  variable="selection">
+               <test
+                     args="ShowHideRelatedLinkEditPolicy"
+                     property="org.eclipse.papyrus.uml.diagram.menu.tester.hasRequiredEditPolicy"
+                     value="true">
+               </test>
+            </with>
+         </and>
+      </activeWhen>
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ShowHideRelatedLinkHandler">
+         <parameter
+               name="showHideRelatedLinkParameter"
+               value="SHOW_ALL_LINK_BETWEEN_SELECTED_ELEMENT">
+         </parameter>
+      </class>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowAllRelatedLinkCommand">
+      <activeWhen>
+         <and>
+            <with
+                  variable="selection">
+               <test
+                     args="ShowHideRelatedLinkEditPolicy"
+                     property="org.eclipse.papyrus.uml.diagram.menu.tester.hasRequiredEditPolicy"
+                     value="true">
+               </test>
+            </with>
+         </and>
+      </activeWhen>
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ShowHideRelatedLinkHandler">
+         <parameter
+               name="showHideRelatedLinkParameter"
+               value="SHOW_ALL_LINK_IN_DIAGRAM">
+         </parameter>
+      </class>
+   </handler>
+   <handler
+         class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.CopyAppearancePropertiesHandler"
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.CopyAppearancePropertiesCommand">
+      <activeWhen>
+         <and>
+            <with
+                  variable="copyAppearanceProperties">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ArrangeAllCommand">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ArrangeHandler">
+         <parameter
+               name="arrange_parameter"
+               value="arrangeAll">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="arrangeAll">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ArrangeSelectionCommand">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ArrangeHandler">
+         <parameter
+               name="arrange_parameter"
+               value="arrangeSelection">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="arrangeSelection">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.BringToFrontCommand">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ZOrderHandler">
+         <parameter
+               name="order_parameter"
+               value="bringToFront">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="bringToFront">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SendToBackCommand">
+      <activeWhen>
+         <and>
+            <with
+                  variable="sendToBack">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ZOrderHandler">
+         <parameter
+               name="order_parameter"
+               value="sendToBack">
+         </parameter>
+      </class>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.BringForwardCommand">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ZOrderHandler">
+         <parameter
+               name="order_parameter"
+               value="bringForward">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="bringForward">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SendBackwardCommand">
+      <activeWhen>
+         <and>
+            <with
+                  variable="sendBackward">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ZOrderHandler">
+         <parameter
+               name="order_parameter"
+               value="sendBackward">
+         </parameter>
+      </class>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SelectAllCommand">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.SelectHandler">
+         <parameter
+               name="select_parameter"
+               value="selectAll">
+         </parameter></class>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SelectAllShapesCommand">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.SelectHandler">
+         <parameter
+               name="select_parameter"
+               value="selectAllShapes">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="selectAllShapes">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SelectAllConnectorsCommand">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.SelectHandler">
+         <parameter
+               name="select_parameter"
+               value="selectAllConnectors">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="selectAllConnectors">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.FontHandler"
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.FontCommand">
+      <activeWhen>
+         <and>
+            <with
+                  variable="font">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.rectilinear">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineStyleHandler">
+         <parameter
+               name="line_style_parameter"
+               value="rectilinear">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="lineStyle">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.oblique">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineStyleHandler">
+         <parameter
+               name="line_style_parameter"
+               value="oblique">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="lineStyle">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.tree">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineStyleHandler">
+         <parameter
+               name="line_style_parameter"
+               value="tree">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="lineStyleTree">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.removebendpoint">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineStyleHandler">
+         <parameter
+               name="line_style_parameter"
+               value="remove_benpoints">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="lineStyle">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.link.label.hide.all">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ShowHideLabelsHandler">
+         <parameter
+               name="show_hide_link_label_parameter"
+               value="hide">
+         </parameter>
+      </class>
+      <activeWhen>
+         <with
+               variable="showHideLabels">
+            <equals
+                  value="enabled">
+            </equals>
+         </with>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.link.label.show.all">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ShowHideLabelsHandler">
+         <parameter
+               name="show_hide_link_label_parameter"
+               value="show">
+         </parameter>
+      </class>
+      <activeWhen>
+         <with
+               variable="showHideLabels">
+            <equals
+                  value="enabled">
+            </equals>
+         </with></activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.link.label.manager">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ShowHideLabelsHandler">
+         <parameter
+               name="show_hide_link_label_parameter"
+               value="manage">
+         </parameter>
+      </class>
+      <activeWhen>
+         <with
+               variable="showHideLabels">
+            <equals
+                  value="enabled">
+            </equals>
+         </with></activeWhen>
+   </handler>
+</extension>
+<extension
+      point="org.eclipse.ui.services">
+   <sourceProvider
+         provider="org.eclipse.papyrus.uml.diagram.menu.providers.HandlerStateSourceProvider">
+      <variable
+            name="showHideContents"
+            priorityLevel="workbench">
+      </variable>
+      <variable
+            name="showHideCompartments"
+            priorityLevel="workbench">
+      </variable>
+      <variable
+            name="copyAppearanceProperties"
+            priorityLevel="workbench">
+      </variable>
+      <variable
+            name="grid"
+            priorityLevel="workbench">
+      </variable>
+      <variable
+            name="rulers"
+            priorityLevel="workbench">
+      </variable>
+      <variable
+            name="pageBreaks"
+            priorityLevel="workbench">
+      </variable>
+      <variable
+            name="recalculatePageBreaks"
+            priorityLevel="workbench">
+      </variable>
+      <variable
+            name="snapToGrid"
+            priorityLevel="workbench">
+      </variable>
+      <variable
+            name="sortFilterCompartmentItems"
+            priorityLevel="workbench">
+      </variable>
+      <variable
+            name="bringToFront"
+            priorityLevel="workbench">
+      </variable>
+      <variable
+            name="sendToBack"
+            priorityLevel="workbench">
+      </variable>
+      <variable
+            name="bringForward"
+            priorityLevel="workbench">
+      </variable>
+      <variable
+            name="sendBackward"
+            priorityLevel="workbench">
+      </variable>
+      <variable
+            name="arrangeAll"
+            priorityLevel="workbench">
+      </variable>
+      <variable
+            name="arrangeSelection"
+            priorityLevel="workbench">
+      </variable>
+      <variable
+            name="selectAll"
+            priorityLevel="workbench">
+      </variable>
+      <variable
+            name="selectAllConnectors"
+            priorityLevel="workbench">
+      </variable>
+      <variable
+            name="selectAllShapes"
+            priorityLevel="workbench">
+      </variable>
+      <variable
+            name="font"
+            priorityLevel="workbench">
+      </variable>
+      <variable
+            name="fillColor"
+            priorityLevel="workbench">
+      </variable>
+      <variable
+            name="lineColor"
+            priorityLevel="workbench">
+      </variable>
+      <variable
+            name="lineStyle"
+            priorityLevel="workbench">
+      </variable>
+      <variable
+            name="lineTree"
+            priorityLevel="workbench">
+      </variable>
+      <variable
+            name="showHideLabels"
+            priorityLevel="workbench">
+      </variable>
+   </sourceProvider>
+</extension>
+<extension
+      id="PapyrusFillColorCommand"
+      name="FillColorCommand"
+      point="org.eclipse.ui.commands">
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to fill in white the selected shapes"
+         id="org.eclipse.papyrus.uml.diagram.menu.fill.color.white.command"
+         name="Fill White Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to fill in black the selected shapes"
+         id="org.eclipse.papyrus.uml.diagram.menu.fill.color.black.command"
+         name="Fill Black Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to fill in light gray the selected shapes"
+         id="org.eclipse.papyrus.uml.diagram.menu.fill.color.lightgray.command"
+         name="Fill Light Gray Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to fill in gray the selected shapes"
+         id="org.eclipse.papyrus.uml.diagram.menu.fill.color.gray.command"
+         name="Fill Gray Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to fill in dark gray the selected shapes"
+         id="org.eclipse.papyrus.uml.diagram.menu.fill.color.darkgray.command"
+         name="Fill Dark Gray Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to fill in red the selected shapes"
+         id="org.eclipse.papyrus.uml.diagram.menu.fill.color.red.command"
+         name="Fill Red Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to fill in green the selected shapes"
+         id="org.eclipse.papyrus.uml.diagram.menu.fill.color.green.command"
+         name="Fill Green Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to fill in blue the selected shapes"
+         id="org.eclipse.papyrus.uml.diagram.menu.fill.color.blue.command"
+         name="Fill Blue Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to fill in yellow the selected shapes"
+         id="org.eclipse.papyrus.uml.diagram.menu.fill.color.yellow.command"
+         name="Fill Yellow Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to fill in magenta the selected shapes"
+         id="org.eclipse.papyrus.uml.diagram.menu.fill.color.magenta.command"
+         name="Fill Magenta Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to fill in cyan the selected shapes"
+         id="org.eclipse.papyrus.uml.diagram.menu.fill.color.cyan.command"
+         name="Fill Cyan Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to fill in pink the selected shapes"
+         id="org.eclipse.papyrus.uml.diagram.menu.fill.color.pink.command"
+         name="Fill Pink Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to fill in orange the selected shapes"
+         id="org.eclipse.papyrus.uml.diagram.menu.fill.color.orange.command"
+         name="Fill Orange Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to fill with the default color the selected shapes"
+         id="org.eclipse.papyrus.uml.diagram.menu.fill.color.defaultcolor.command"
+         name="Fill Default Color Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to fill with another color the selected shapes"
+         id="org.eclipse.papyrus.uml.diagram.menu.fill.color.morecolors.command"
+         name="Fill With Another Color Command">
+   </command>
+</extension>
+<extension
+      id="PapyrusFillColorHandler"
+      name="FillColorHandler"
+      point="org.eclipse.ui.handlers">
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.white.command">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.FillColorHandler">
+         <parameter
+               name="color_parameter"
+               value="White">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="fillColor">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.black.command">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.FillColorHandler">
+         <parameter
+               name="color_parameter"
+               value="Black">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="fillColor">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.lightgray.command">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.FillColorHandler">
+         <parameter
+               name="color_parameter"
+               value="Light Gray">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="fillColor">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.gray.command">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.FillColorHandler">
+         <parameter
+               name="color_parameter"
+               value="Gray">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="fillColor">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.darkgray.command">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.FillColorHandler">
+         <parameter
+               name="color_parameter"
+               value="Dark Gray">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="fillColor">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.red.command">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.FillColorHandler">
+         <parameter
+               name="color_parameter"
+               value="Red">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="fillColor">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.green.command">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.FillColorHandler">
+         <parameter
+               name="color_parameter"
+               value="Green">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="fillColor">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.blue.command">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.FillColorHandler">
+         <parameter
+               name="color_parameter"
+               value="Blue">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="fillColor">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.yellow.command">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.FillColorHandler">
+         <parameter
+               name="color_parameter"
+               value="Yellow">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="fillColor">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.magenta.command">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.FillColorHandler">
+         <parameter
+               name="color_parameter"
+               value="Magenta">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="fillColor">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.cyan.command">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.FillColorHandler">
+         <parameter
+               name="color_parameter"
+               value="Cyan">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="fillColor">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.pink.command">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.FillColorHandler">
+         <parameter
+               name="color_parameter"
+               value="Pink">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="fillColor">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.orange.command">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.FillColorHandler">
+         <parameter
+               name="color_parameter"
+               value="Orange">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="fillColor">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.defaultcolor.command">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.FillColorHandler">
+         <parameter
+               name="color_parameter"
+               value="default_color">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="fillColor">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.morecolors.command">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.FillColorHandler">
+         <parameter
+               name="color_parameter"
+               value="more_colors">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="fillColor">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+</extension>
+<extension
+      id="PapyrusLineColorCommand"
+      name="LineColorCommand"
+      point="org.eclipse.ui.commands">
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to set the lines in white"
+         id="org.eclipse.papyrus.uml.diagram.menu.line.color.white.command"
+         name="Set Lines In White Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to set the lines in black"
+         id="org.eclipse.papyrus.uml.diagram.menu.line.color.black.command"
+         name="Set Lines In Black Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to set the lines in light gray"
+         id="org.eclipse.papyrus.uml.diagram.menu.line.color.lightgray.command"
+         name="Set Lines In Light Gray Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to set the line in gray"
+         id="org.eclipse.papyrus.uml.diagram.menu.line.color.gray.command"
+         name="Set Lines In Gray Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to set the lines in dark gray "
+         id="org.eclipse.papyrus.uml.diagram.menu.line.color.darkgray.command"
+         name="Set Lines In Dark Gray Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to set the lines in red"
+         id="org.eclipse.papyrus.uml.diagram.menu.line.color.red.command"
+         name="Set Lines In Red Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to set the lines in green"
+         id="org.eclipse.papyrus.uml.diagram.menu.line.color.green.command"
+         name="Set Lines In Green Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to set the lines in blue"
+         id="org.eclipse.papyrus.uml.diagram.menu.line.color.blue.command"
+         name="Set Lines In Blue Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to set the lines in yellow"
+         id="org.eclipse.papyrus.uml.diagram.menu.line.color.yellow.command"
+         name="Set Lines In Yellow Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to set the lines in magenta"
+         id="org.eclipse.papyrus.uml.diagram.menu.line.color.magenta.command"
+         name="Set Lines In Magenta Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to set the lines in cyan"
+         id="org.eclipse.papyrus.uml.diagram.menu.line.color.cyan.command"
+         name="Set Lines In Cyan Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to set the lines in pink"
+         id="org.eclipse.papyrus.uml.diagram.menu.line.color.pink.command"
+         name="Set Lines In Pink Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to set the lines in orange"
+         id="org.eclipse.papyrus.uml.diagram.menu.line.color.orange.command"
+         name="Set Lines In Orange Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to set the lines in the default color"
+         id="org.eclipse.papyrus.uml.diagram.menu.line.color.defaultcolor.command"
+         name="Set Lines In Default Color Command">
+   </command>
+   <command
+         categoryId="org.eclipse.papyrus.editor.category"
+         description="The command to set the lines in another color"
+         id="org.eclipse.papyrus.uml.diagram.menu.line.color.morecolors.command"
+         name="Set lines In Another Color Command">
+   </command>
+</extension>
+<extension
+      id="PapyrusLineColorHandler"
+      name="LineColorHandler"
+      point="org.eclipse.ui.handlers">
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.white.command">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineColorHandler">
+         <parameter
+               name="color_parameter"
+               value="White">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="lineColor">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.black.command">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineColorHandler">
+         <parameter
+               name="color_parameter"
+               value="Black">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="lineColor">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.lightgray.command">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineColorHandler">
+         <parameter
+               name="color_parameter"
+               value="Light Gray">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="lineColor">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.gray.command">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineColorHandler">
+         <parameter
+               name="color_parameter"
+               value="Gray">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="lineColor">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.darkgray.command">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineColorHandler">
+         <parameter
+               name="color_parameter"
+               value="Dark Gray">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="lineColor">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.red.command">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineColorHandler">
+         <parameter
+               name="color_parameter"
+               value="Red">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="lineColor">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.green.command">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineColorHandler">
+         <parameter
+               name="color_parameter"
+               value="Green">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="lineColor">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.blue.command">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineColorHandler">
+         <parameter
+               name="color_parameter"
+               value="Blue">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="lineColor">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.yellow.command">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineColorHandler">
+         <parameter
+               name="color_parameter"
+               value="Yellow">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="lineColor">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.magenta.command">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineColorHandler">
+         <parameter
+               name="color_parameter"
+               value="Magenta">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="lineColor">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.cyan.command">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineColorHandler">
+         <parameter
+               name="color_parameter"
+               value="Cyan">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="lineColor">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.pink.command">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineColorHandler">
+         <parameter
+               name="color_parameter"
+               value="Pink">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="lineColor">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.orange.command">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineColorHandler">
+         <parameter
+               name="color_parameter"
+               value="Orange">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="lineColor">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.defaultcolor.command">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineColorHandler">
+         <parameter
+               name="color_parameter"
+               value="default_color">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="lineColor">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
+   <handler
+         commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.morecolors.command">
+      <class
+            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineColorHandler">
+         <parameter
+               name="color_parameter"
+               value="more_colors">
+         </parameter>
+      </class>
+      <activeWhen>
+         <and>
+            <with
+                  variable="lineColor">
+               <equals
+                     value="enabled">
+               </equals>
+            </with>
+         </and>
+      </activeWhen>
+   </handler>
 </extension>
-<extension

-      point="org.eclipse.ui.handlers">

-   <handler

-         class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.SizeHandler"

-         commandId="org.eclipse.papyrus.uml.diagram.menu.command.autosize">

-      <enabledWhen>

-         <iterate>

-            <instanceof

-                  value="org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart">

-            </instanceof>

-            <and>

-               <not>

-                  <instanceof

-                        value="org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart">

-                  </instanceof>

-               </not>

-            </and>

-         </iterate>

-      </enabledWhen>

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.SizeHandler">

-         <parameter

-               name="org.eclipse.papyrus.uml.diagram.menu.commandSizeParameter"

-               value="parameter_autosize">

-         </parameter>

-      </class>

-   </handler>

-   <handler

-         class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ShowHideContentsHandler"

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideContentsCommand">

-      <activeWhen>

-         <and>

-            <with

-                  variable="showHideContents">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ShowHideCompartmentHandler"

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideCompartmentCommand">

-      <activeWhen>

-         <and>

-            <with

-                  variable="showHideCompartments">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowHideRelatedLinkCommand">

-      <activeWhen>

-         <and>

-            <with

-                  variable="selection">

-               <test

-                     args="ShowHideRelatedLinkEditPolicy"

-                     property="org.eclipse.papyrus.uml.diagram.menu.tester.hasRequiredEditPolicy"

-                     value="true">

-               </test>

-            </with>

-         </and>

-      </activeWhen>

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ShowHideRelatedLinkHandler">

-         <parameter

-               name="showHideRelatedLinkParameter"

-               value="OPEN_DIALOG">

-         </parameter>

-      </class>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowRelatedLinkBetweenSelectedElementsCommand">

-      <activeWhen>

-         <and>

-            <with

-                  variable="selection">

-               <test

-                     args="ShowHideRelatedLinkEditPolicy"

-                     property="org.eclipse.papyrus.uml.diagram.menu.tester.hasRequiredEditPolicy"

-                     value="true">

-               </test>

-            </with>

-         </and>

-      </activeWhen>

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ShowHideRelatedLinkHandler">

-         <parameter

-               name="showHideRelatedLinkParameter"

-               value="SHOW_ALL_LINK_BETWEEN_SELECTED_ELEMENT">

-         </parameter>

-      </class>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ShowAllRelatedLinkCommand">

-      <activeWhen>

-         <and>

-            <with

-                  variable="selection">

-               <test

-                     args="ShowHideRelatedLinkEditPolicy"

-                     property="org.eclipse.papyrus.uml.diagram.menu.tester.hasRequiredEditPolicy"

-                     value="true">

-               </test>

-            </with>

-         </and>

-      </activeWhen>

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ShowHideRelatedLinkHandler">

-         <parameter

-               name="showHideRelatedLinkParameter"

-               value="SHOW_ALL_LINK_IN_DIAGRAM">

-         </parameter>

-      </class>

-   </handler>

-   <handler

-         class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.CopyAppearancePropertiesHandler"

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.CopyAppearancePropertiesCommand">

-      <activeWhen>

-         <and>

-            <with

-                  variable="copyAppearanceProperties">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ArrangeAllCommand">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ArrangeHandler">

-         <parameter

-               name="arrange_parameter"

-               value="arrangeAll">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="arrangeAll">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ArrangeSelectionCommand">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ArrangeHandler">

-         <parameter

-               name="arrange_parameter"

-               value="arrangeSelection">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="arrangeSelection">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.BringToFrontCommand">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ZOrderHandler">

-         <parameter

-               name="order_parameter"

-               value="bringToFront">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="bringToFront">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SendToBackCommand">

-      <activeWhen>

-         <and>

-            <with

-                  variable="sendToBack">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ZOrderHandler">

-         <parameter

-               name="order_parameter"

-               value="sendToBack">

-         </parameter>

-      </class>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.BringForwardCommand">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ZOrderHandler">

-         <parameter

-               name="order_parameter"

-               value="bringForward">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="bringForward">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SendBackwardCommand">

-      <activeWhen>

-         <and>

-            <with

-                  variable="sendBackward">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ZOrderHandler">

-         <parameter

-               name="order_parameter"

-               value="sendBackward">

-         </parameter>

-      </class>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SelectAllCommand">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.SelectHandler">

-         <parameter

-               name="select_parameter"

-               value="selectAll">

-         </parameter></class>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SelectAllShapesCommand">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.SelectHandler">

-         <parameter

-               name="select_parameter"

-               value="selectAllShapes">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="selectAllShapes">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SelectAllConnectorsCommand">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.SelectHandler">

-         <parameter

-               name="select_parameter"

-               value="selectAllConnectors">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="selectAllConnectors">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.FontHandler"

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.FontCommand">

-      <activeWhen>

-         <and>

-            <with

-                  variable="font">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.rectilinear">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineStyleHandler">

-         <parameter

-               name="line_style_parameter"

-               value="rectilinear">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="lineStyle">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.oblique">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineStyleHandler">

-         <parameter

-               name="line_style_parameter"

-               value="oblique">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="lineStyle">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.tree">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineStyleHandler">

-         <parameter

-               name="line_style_parameter"

-               value="tree">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="lineStyleTree">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.line.style.removebendpoint">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineStyleHandler">

-         <parameter

-               name="line_style_parameter"

-               value="remove_benpoints">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="lineStyle">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.link.label.hide.all">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ShowHideLabelsHandler">

-         <parameter

-               name="show_hide_link_label_parameter"

-               value="hide">

-         </parameter>

-      </class>

-      <activeWhen>

-         <with

-               variable="showHideLabels">

-            <equals

-                  value="enabled">

-            </equals>

-         </with>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.link.label.show.all">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ShowHideLabelsHandler">

-         <parameter

-               name="show_hide_link_label_parameter"

-               value="show">

-         </parameter>

-      </class>

-      <activeWhen>

-         <with

-               variable="showHideLabels">

-            <equals

-                  value="enabled">

-            </equals>

-         </with></activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.link.label.manager">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ShowHideLabelsHandler">

-         <parameter

-               name="show_hide_link_label_parameter"

-               value="manage">

-         </parameter>

-      </class>

-      <activeWhen>

-         <with

-               variable="showHideLabels">

-            <equals

-                  value="enabled">

-            </equals>

-         </with></activeWhen>

-   </handler>

-</extension>

-<extension

-      point="org.eclipse.ui.services">

-   <sourceProvider

-         provider="org.eclipse.papyrus.uml.diagram.menu.providers.HandlerStateSourceProvider">

-      <variable

-            name="showHideContents"

-            priorityLevel="workbench">

-      </variable>

-      <variable

-            name="showHideCompartments"

-            priorityLevel="workbench">

-      </variable>

-      <variable

-            name="copyAppearanceProperties"

-            priorityLevel="workbench">

-      </variable>

-      <variable

-            name="grid"

-            priorityLevel="workbench">

-      </variable>

-      <variable

-            name="rulers"

-            priorityLevel="workbench">

-      </variable>

-      <variable

-            name="pageBreaks"

-            priorityLevel="workbench">

-      </variable>

-      <variable

-            name="recalculatePageBreaks"

-            priorityLevel="workbench">

-      </variable>

-      <variable

-            name="snapToGrid"

-            priorityLevel="workbench">

-      </variable>

-      <variable

-            name="sortFilterCompartmentItems"

-            priorityLevel="workbench">

-      </variable>

-      <variable

-            name="bringToFront"

-            priorityLevel="workbench">

-      </variable>

-      <variable

-            name="sendToBack"

-            priorityLevel="workbench">

-      </variable>

-      <variable

-            name="bringForward"

-            priorityLevel="workbench">

-      </variable>

-      <variable

-            name="sendBackward"

-            priorityLevel="workbench">

-      </variable>

-      <variable

-            name="arrangeAll"

-            priorityLevel="workbench">

-      </variable>

-      <variable

-            name="arrangeSelection"

-            priorityLevel="workbench">

-      </variable>

-      <variable

-            name="selectAll"

-            priorityLevel="workbench">

-      </variable>

-      <variable

-            name="selectAllConnectors"

-            priorityLevel="workbench">

-      </variable>

-      <variable

-            name="selectAllShapes"

-            priorityLevel="workbench">

-      </variable>

-      <variable

-            name="font"

-            priorityLevel="workbench">

-      </variable>

-      <variable

-            name="fillColor"

-            priorityLevel="workbench">

-      </variable>

-      <variable

-            name="lineColor"

-            priorityLevel="workbench">

-      </variable>

-      <variable

-            name="lineStyle"

-            priorityLevel="workbench">

-      </variable>

-      <variable

-            name="lineTree"

-            priorityLevel="workbench">

-      </variable>

-      <variable

-            name="showHideLabels"

-            priorityLevel="workbench">

-      </variable>

-   </sourceProvider>

-</extension>

-<extension

-      id="PapyrusFillColorCommand"

-      name="FillColorCommand"

-      point="org.eclipse.ui.commands">

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to fill in white the selected shapes"

-         id="org.eclipse.papyrus.uml.diagram.menu.fill.color.white.command"

-         name="Fill White Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to fill in black the selected shapes"

-         id="org.eclipse.papyrus.uml.diagram.menu.fill.color.black.command"

-         name="Fill Black Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to fill in light gray the selected shapes"

-         id="org.eclipse.papyrus.uml.diagram.menu.fill.color.lightgray.command"

-         name="Fill Light Gray Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to fill in gray the selected shapes"

-         id="org.eclipse.papyrus.uml.diagram.menu.fill.color.gray.command"

-         name="Fill Gray Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to fill in dark gray the selected shapes"

-         id="org.eclipse.papyrus.uml.diagram.menu.fill.color.darkgray.command"

-         name="Fill Dark Gray Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to fill in red the selected shapes"

-         id="org.eclipse.papyrus.uml.diagram.menu.fill.color.red.command"

-         name="Fill Red Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to fill in green the selected shapes"

-         id="org.eclipse.papyrus.uml.diagram.menu.fill.color.green.command"

-         name="Fill Green Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to fill in blue the selected shapes"

-         id="org.eclipse.papyrus.uml.diagram.menu.fill.color.blue.command"

-         name="Fill Blue Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to fill in yellow the selected shapes"

-         id="org.eclipse.papyrus.uml.diagram.menu.fill.color.yellow.command"

-         name="Fill Yellow Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to fill in magenta the selected shapes"

-         id="org.eclipse.papyrus.uml.diagram.menu.fill.color.magenta.command"

-         name="Fill Magenta Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to fill in cyan the selected shapes"

-         id="org.eclipse.papyrus.uml.diagram.menu.fill.color.cyan.command"

-         name="Fill Cyan Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to fill in pink the selected shapes"

-         id="org.eclipse.papyrus.uml.diagram.menu.fill.color.pink.command"

-         name="Fill Pink Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to fill in orange the selected shapes"

-         id="org.eclipse.papyrus.uml.diagram.menu.fill.color.orange.command"

-         name="Fill Orange Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to fill with the default color the selected shapes"

-         id="org.eclipse.papyrus.uml.diagram.menu.fill.color.defaultcolor.command"

-         name="Fill Default Color Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to fill with another color the selected shapes"

-         id="org.eclipse.papyrus.uml.diagram.menu.fill.color.morecolors.command"

-         name="Fill With Another Color Command">

-   </command>

-</extension>

-<extension

-      id="PapyrusFillColorHandler"

-      name="FillColorHandler"

-      point="org.eclipse.ui.handlers">

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.white.command">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.FillColorHandler">

-         <parameter

-               name="color_parameter"

-               value="White">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="fillColor">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.black.command">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.FillColorHandler">

-         <parameter

-               name="color_parameter"

-               value="Black">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="fillColor">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.lightgray.command">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.FillColorHandler">

-         <parameter

-               name="color_parameter"

-               value="Light Gray">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="fillColor">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.gray.command">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.FillColorHandler">

-         <parameter

-               name="color_parameter"

-               value="Gray">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="fillColor">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.darkgray.command">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.FillColorHandler">

-         <parameter

-               name="color_parameter"

-               value="Dark Gray">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="fillColor">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.red.command">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.FillColorHandler">

-         <parameter

-               name="color_parameter"

-               value="Red">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="fillColor">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.green.command">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.FillColorHandler">

-         <parameter

-               name="color_parameter"

-               value="Green">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="fillColor">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.blue.command">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.FillColorHandler">

-         <parameter

-               name="color_parameter"

-               value="Blue">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="fillColor">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.yellow.command">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.FillColorHandler">

-         <parameter

-               name="color_parameter"

-               value="Yellow">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="fillColor">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.magenta.command">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.FillColorHandler">

-         <parameter

-               name="color_parameter"

-               value="Magenta">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="fillColor">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.cyan.command">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.FillColorHandler">

-         <parameter

-               name="color_parameter"

-               value="Cyan">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="fillColor">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.pink.command">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.FillColorHandler">

-         <parameter

-               name="color_parameter"

-               value="Pink">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="fillColor">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.orange.command">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.FillColorHandler">

-         <parameter

-               name="color_parameter"

-               value="Orange">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="fillColor">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.defaultcolor.command">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.FillColorHandler">

-         <parameter

-               name="color_parameter"

-               value="default_color">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="fillColor">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.fill.color.morecolors.command">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.FillColorHandler">

-         <parameter

-               name="color_parameter"

-               value="more_colors">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="fillColor">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-</extension>

-<extension

-      id="PapyrusLineColorCommand"

-      name="LineColorCommand"

-      point="org.eclipse.ui.commands">

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to set the lines in white"

-         id="org.eclipse.papyrus.uml.diagram.menu.line.color.white.command"

-         name="Set Lines In White Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to set the lines in black"

-         id="org.eclipse.papyrus.uml.diagram.menu.line.color.black.command"

-         name="Set Lines In Black Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to set the lines in light gray"

-         id="org.eclipse.papyrus.uml.diagram.menu.line.color.lightgray.command"

-         name="Set Lines In Light Gray Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to set the line in gray"

-         id="org.eclipse.papyrus.uml.diagram.menu.line.color.gray.command"

-         name="Set Lines In Gray Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to set the lines in dark gray "

-         id="org.eclipse.papyrus.uml.diagram.menu.line.color.darkgray.command"

-         name="Set Lines In Dark Gray Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to set the lines in red"

-         id="org.eclipse.papyrus.uml.diagram.menu.line.color.red.command"

-         name="Set Lines In Red Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to set the lines in green"

-         id="org.eclipse.papyrus.uml.diagram.menu.line.color.green.command"

-         name="Set Lines In Green Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to set the lines in blue"

-         id="org.eclipse.papyrus.uml.diagram.menu.line.color.blue.command"

-         name="Set Lines In Blue Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to set the lines in yellow"

-         id="org.eclipse.papyrus.uml.diagram.menu.line.color.yellow.command"

-         name="Set Lines In Yellow Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to set the lines in magenta"

-         id="org.eclipse.papyrus.uml.diagram.menu.line.color.magenta.command"

-         name="Set Lines In Magenta Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to set the lines in cyan"

-         id="org.eclipse.papyrus.uml.diagram.menu.line.color.cyan.command"

-         name="Set Lines In Cyan Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to set the lines in pink"

-         id="org.eclipse.papyrus.uml.diagram.menu.line.color.pink.command"

-         name="Set Lines In Pink Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to set the lines in orange"

-         id="org.eclipse.papyrus.uml.diagram.menu.line.color.orange.command"

-         name="Set Lines In Orange Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to set the lines in the default color"

-         id="org.eclipse.papyrus.uml.diagram.menu.line.color.defaultcolor.command"

-         name="Set Lines In Default Color Command">

-   </command>

-   <command

-         categoryId="org.eclipse.papyrus.editor.category"

-         description="The command to set the lines in another color"

-         id="org.eclipse.papyrus.uml.diagram.menu.line.color.morecolors.command"

-         name="Set lines In Another Color Command">

-   </command>

-</extension>

-<extension

-      id="PapyrusLineColorHandler"

-      name="LineColorHandler"

-      point="org.eclipse.ui.handlers">

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.white.command">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineColorHandler">

-         <parameter

-               name="color_parameter"

-               value="White">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="lineColor">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.black.command">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineColorHandler">

-         <parameter

-               name="color_parameter"

-               value="Black">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="lineColor">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.lightgray.command">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineColorHandler">

-         <parameter

-               name="color_parameter"

-               value="Light Gray">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="lineColor">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.gray.command">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineColorHandler">

-         <parameter

-               name="color_parameter"

-               value="Gray">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="lineColor">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.darkgray.command">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineColorHandler">

-         <parameter

-               name="color_parameter"

-               value="Dark Gray">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="lineColor">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.red.command">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineColorHandler">

-         <parameter

-               name="color_parameter"

-               value="Red">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="lineColor">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.green.command">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineColorHandler">

-         <parameter

-               name="color_parameter"

-               value="Green">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="lineColor">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.blue.command">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineColorHandler">

-         <parameter

-               name="color_parameter"

-               value="Blue">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="lineColor">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.yellow.command">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineColorHandler">

-         <parameter

-               name="color_parameter"

-               value="Yellow">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="lineColor">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.magenta.command">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineColorHandler">

-         <parameter

-               name="color_parameter"

-               value="Magenta">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="lineColor">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.cyan.command">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineColorHandler">

-         <parameter

-               name="color_parameter"

-               value="Cyan">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="lineColor">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.pink.command">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineColorHandler">

-         <parameter

-               name="color_parameter"

-               value="Pink">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="lineColor">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.orange.command">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineColorHandler">

-         <parameter

-               name="color_parameter"

-               value="Orange">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="lineColor">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.defaultcolor.command">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineColorHandler">

-         <parameter

-               name="color_parameter"

-               value="default_color">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="lineColor">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-   <handler

-         commandId="org.eclipse.papyrus.uml.diagram.menu.line.color.morecolors.command">

-      <class

-            class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineColorHandler">

-         <parameter

-               name="color_parameter"

-               value="more_colors">

-         </parameter>

-      </class>

-      <activeWhen>

-         <and>

-            <with

-                  variable="lineColor">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

-      </activeWhen>

-   </handler>

-</extension>

-

-<!--                                                      -->

-

-      <extension

-            point="org.eclipse.core.expressions.propertyTesters">

-         <propertyTester

-               class="org.eclipse.papyrus.uml.diagram.menu.providers.DiagramPropertyTester"

-               id="org.eclipse.papyrus.uml.diagram.menu.tester"

-               namespace="org.eclipse.papyrus.uml.diagram.menu.tester"

-               properties="isDiagram,hasRequiredEditPolicy"

-               type="org.eclipse.jface.viewers.IStructuredSelection">

-         </propertyTester>

-      </extension>

-      <extension

-            point="org.eclipse.ui.menus">

-         <menuContribution

-               allPopups="false"

-               locationURI="popup:org.eclipse.papyrus.infra.gmfdiag.menu.editmenu?after=edit_actions_separator">

-            <command

-                  commandId="org.eclipse.papyrus.uml.diagram.menu.pastewithmodel"

-                  style="push">

-            </command>

-            <command

-                  commandId="org.eclipse.papyrus.infra.gmfdiag.menu.cleandiagram"

-                  style="push">

-            </command>

-         </menuContribution>

-      </extension>

-      <extension

-            point="org.eclipse.ui.commandImages">

-         <image

-               commandId="org.eclipse.papyrus.uml.diagram.menu.pastewithmodel"

-               icon="icons/paste_edit.gif">

-         </image>

-      </extension>

-      <extension

-            point="org.eclipse.ui.commands">

-         <command

-               categoryId="org.eclipse.papyrus.editor.category"

-               defaultHandler="org.eclipse.papyrus.uml.diagram.menu.handlers.PasteWithModelHandler"

-               id="org.eclipse.papyrus.uml.diagram.menu.pastewithmodel"

-               name="Paste With Model">

-         </command>

-         <command

-               categoryId="org.eclipse.papyrus.editor.category"

-               description="This action remove the invalid views from the diagram"

-               id="org.eclipse.papyrus.infra.gmfdiag.menu.cleandiagram"

-               name="Clean Diagram">

-         </command>

-      </extension>

-      <extension

-            point="org.eclipse.ui.bindings">

-         <key

-               commandId="org.eclipse.papyrus.uml.diagram.menu.pastewithmodel"

-               schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"

-               sequence="M1+M2+V">

-         </key>

-      </extension>        

-<!--                                                            -->

-

-</plugin>

+
+<!--                                                      -->
+
+      <extension
+            point="org.eclipse.core.expressions.propertyTesters">
+         <propertyTester
+               class="org.eclipse.papyrus.uml.diagram.menu.providers.DiagramPropertyTester"
+               id="org.eclipse.papyrus.uml.diagram.menu.tester"
+               namespace="org.eclipse.papyrus.uml.diagram.menu.tester"
+               properties="isDiagram,hasRequiredEditPolicy"
+               type="org.eclipse.jface.viewers.IStructuredSelection">
+         </propertyTester>
+      </extension>
+      <extension
+            point="org.eclipse.ui.menus">
+         <menuContribution
+               allPopups="false"
+               locationURI="popup:org.eclipse.papyrus.infra.gmfdiag.menu.editmenu?after=edit_actions_separator">
+            <command
+                  commandId="org.eclipse.papyrus.infra.gmfdiag.menu.pastewithmodel"
+                  style="push">
+            </command>
+            <command
+                  commandId="org.eclipse.papyrus.infra.gmfdiag.menu.cleandiagram"
+                  style="push">
+            </command>
+         </menuContribution>
+      </extension>
+      <extension
+            point="org.eclipse.ui.commandImages">
+         <image
+               commandId="org.eclipse.papyrus.infra.gmfdiag.menu.pastewithmodel"
+               icon="icons/paste_edit.gif">
+         </image>
+      </extension>
+      <extension
+            point="org.eclipse.ui.commands">
+         <command
+               categoryId="org.eclipse.papyrus.editor.category"
+               defaultHandler="org.eclipse.papyrus.uml.diagram.menu.handlers.PasteWithModelHandler"
+               id="org.eclipse.papyrus.infra.gmfdiag.menu.pastewithmodel"
+               name="Paste With Model">
+         </command>
+         <command
+               categoryId="org.eclipse.papyrus.editor.category"
+               description="This action remove the invalid views from the diagram"
+               id="org.eclipse.papyrus.infra.gmfdiag.menu.cleandiagram"
+               name="Clean Diagram">
+         </command>
+      </extension>
+      <extension
+            point="org.eclipse.ui.bindings">
+         <key
+               commandId="org.eclipse.papyrus.infra.gmfdiag.menu.pastewithmodel"
+               contextId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"
+               schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+               sequence="M1+V">
+         </key>
+      </extension>
+<!--                                                      -->      
+</plugin>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/handlers/PasteWithModelHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/handlers/PasteWithModelHandler.java
index bd6beb91445..e6891595d15 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/handlers/PasteWithModelHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/handlers/PasteWithModelHandler.java
@@ -1,97 +1,95 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.menu.handlers;

-

-import java.awt.Toolkit;

-import java.util.Collection;

-

-import org.eclipse.core.commands.AbstractHandler;

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.expressions.IEvaluationContext;

-import org.eclipse.gef.RootEditPart;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.uml.diagram.common.helper.CleanDiagramHelper;

-import org.eclipse.papyrus.uml.pastemanager.service.PasteCommandService;

-

-/**

- * The handler for the paste with model action

- * 

- * @author vl222926

- * 

- */

-public class PasteWithModelHandler extends AbstractHandler {

-

-	/**

-	 * the paste command

-	 */

-	private ICommand pasteCommand = null;

-

-	/**

-	 * the target edit part

-	 */

-	private GraphicalEditPart targetEditPart = null;

-

-	/**

-	 * 

-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

-	 * 

-	 * @param event

-	 * @return

-	 * @throws ExecutionException

-	 */

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		if(pasteCommand != null && pasteCommand.canExecute()) {

-			targetEditPart.getEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(pasteCommand));

-			RootEditPart topEditPart = targetEditPart.getRoot();

-			if(topEditPart.getChildren().get(0) instanceof DiagramEditPart) {

-				CleanDiagramHelper.getInstance().run((DiagramEditPart)topEditPart.getChildren().get(0));

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)

-	 * 

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		boolean enabled = false;

-		pasteCommand = null;

-		targetEditPart = null;

-		if(evaluationContext instanceof IEvaluationContext) {

-			Object defaultVariable = ((IEvaluationContext)evaluationContext).getDefaultVariable();

-			if(defaultVariable instanceof Collection<?>) {

-				int size = ((Collection<?>)defaultVariable).size();

-				if(size == 1) {

-					final Object current = ((Collection<?>)defaultVariable).iterator().next();

-					if(current instanceof GraphicalEditPart) {

-						targetEditPart = (GraphicalEditPart)current;

-						pasteCommand = PasteCommandService.getInstance().getPasteWithModelCommand(targetEditPart, Toolkit.getDefaultToolkit().getSystemClipboard(), targetEditPart.getEditingDomain().getClipboard());

-						enabled = pasteCommand != null && pasteCommand.canExecute();

-					}

-				}

-			}

-		}

-		setBaseEnabled(enabled);

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.menu.handlers;
+
+import java.awt.Toolkit;
+import java.util.Collection;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.gef.RootEditPart;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.uml.diagram.common.helper.CleanDiagramHelper;
+import org.eclipse.papyrus.uml.diagram.common.service.PasteCommandService;
+
+/**
+ * The handler for the paste with model action
+ * 
+ */
+public class PasteWithModelHandler extends AbstractHandler {
+
+	/**
+	 * the paste command
+	 */
+	private ICommand pasteCommand = null;
+
+	/**
+	 * the target edit part
+	 */
+	private GraphicalEditPart targetEditPart = null;
+
+	/**
+	 * 
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 * 
+	 * @param event
+	 * @return
+	 * @throws ExecutionException
+	 */
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		if(pasteCommand != null && pasteCommand.canExecute()) {
+			targetEditPart.getEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(pasteCommand));
+			RootEditPart topEditPart = targetEditPart.getRoot();
+			if(topEditPart.getChildren().get(0) instanceof DiagramEditPart) {
+				CleanDiagramHelper.getInstance().run((DiagramEditPart)topEditPart.getChildren().get(0));
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * 
+	 * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)
+	 * 
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		boolean enabled = false;
+		pasteCommand = null;
+		targetEditPart = null;
+		if(evaluationContext instanceof IEvaluationContext) {
+			Object defaultVariable = ((IEvaluationContext)evaluationContext).getDefaultVariable();
+			if(defaultVariable instanceof Collection<?>) {
+				int size = ((Collection<?>)defaultVariable).size();
+				if(size == 1) {
+					final Object current = ((Collection<?>)defaultVariable).iterator().next();
+					if(current instanceof GraphicalEditPart) {
+						targetEditPart = (GraphicalEditPart)current;
+						pasteCommand = PasteCommandService.getInstance().getPasteWithModelCommand(targetEditPart, Toolkit.getDefaultToolkit().getSystemClipboard(), targetEditPart.getEditingDomain().getClipboard());
+						enabled = pasteCommand != null && pasteCommand.canExecute();
+					}
+				}
+			}
+		}
+		setBaseEnabled(enabled);
+	}
+
+
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/plugin.xml
index 9b056b8a84a..c7d6758a721 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/plugin.xml
@@ -478,6 +478,210 @@
 	<diagramMappings diagramID="Package">
 		<mapping type="Package" humanReadableType="PackageDiagram"/>
         <!-- Compartments -->
+        <mapping
+		humanReadableType="attributes"
+		type="7011">
+	</mapping>
+
+	<mapping
+		humanReadableType="operations"
+		type="7012">
+	</mapping>
+
+	<mapping
+		humanReadableType="nested classifiers"
+		type="7013">
+	</mapping>
+
+	<mapping
+		humanReadableType="attributes"
+		type="7023">
+	</mapping>
+
+	<mapping
+		humanReadableType="operations"
+		type="7024">
+	</mapping>
+
+	<mapping
+		humanReadableType="nested classifiers"
+		type="7025">
+	</mapping>
+
+	<mapping
+		humanReadableType="attributes"
+		type="7026">
+	</mapping>
+
+	<mapping
+		humanReadableType="attributes"
+		type="7027">
+	</mapping>
+
+	<mapping
+		humanReadableType="operations"
+		type="7028">
+	</mapping>
+
+	<mapping
+		humanReadableType="nested classifiers"
+		type="7029">
+	</mapping>
+
+	<mapping
+		humanReadableType="attributes"
+		type="7041">
+	</mapping>
+
+	<mapping
+		humanReadableType="operations"
+		type="7042">
+	</mapping>
+
+	<mapping
+		humanReadableType="attributes"
+		type="7032">
+	</mapping>
+
+	<mapping
+		humanReadableType="operations"
+		type="7033">
+	</mapping>
+
+	<mapping
+		humanReadableType="packaged elements"
+		type="7030">
+	</mapping>
+
+	<mapping
+		humanReadableType="packaged elements"
+		type="7010">
+	</mapping>
+
+	<mapping
+		humanReadableType="literals"
+		type="7031">
+	</mapping>
+
+	<mapping
+		humanReadableType="slots"
+		type="7035">
+	</mapping>
+
+	<mapping
+		humanReadableType="attributes"
+		type="7017">
+	</mapping>
+
+	<mapping
+		humanReadableType="operations"
+		type="7018">
+	</mapping>
+
+	<mapping
+		humanReadableType="nested classifiers"
+		type="7019">
+	</mapping>
+
+	<mapping
+		humanReadableType="attributes"
+		type="7002">
+	</mapping>
+
+	<mapping
+		humanReadableType="operations"
+		type="7003">
+	</mapping>
+
+	<mapping
+		humanReadableType="nested classifiers"
+		type="7004">
+	</mapping>
+
+	<mapping
+		humanReadableType="attributes"
+		type="7006">
+	</mapping>
+
+	<mapping
+		humanReadableType="operations"
+		type="7007">
+	</mapping>
+
+	<mapping
+		humanReadableType="nested classifiers"
+		type="7008">
+	</mapping>
+
+	<mapping
+		humanReadableType="attributes"
+		type="7039">
+	</mapping>
+
+	<mapping
+		humanReadableType="operations"
+		type="7040">
+	</mapping>
+
+	<mapping
+		humanReadableType="attributes"
+		type="7020">
+	</mapping>
+
+	<mapping
+		humanReadableType="operations"
+		type="7021">
+	</mapping>
+
+	<mapping
+		humanReadableType="attributes"
+		type="7034">
+	</mapping>
+
+	<mapping
+		humanReadableType="slots"
+		type="7001">
+	</mapping>
+
+	<mapping
+		humanReadableType="attributes"
+		type="7005">
+	</mapping>
+
+	<mapping
+		humanReadableType="packaged elements"
+		type="7009">
+	</mapping>
+
+	<mapping
+		humanReadableType="packaged elements"
+		type="7016">
+	</mapping>
+
+	<mapping
+		humanReadableType="literals"
+		type="7015">
+	</mapping>
+
+	<mapping
+		humanReadableType="operations"
+		type="7036">
+	</mapping>
+
+	<mapping
+		humanReadableType="nested classifiers"
+		type="7037">
+	</mapping>
+
+	<mapping
+		humanReadableType="TemplateParameter"
+		type="7014">
+	</mapping>
+
+	<mapping
+		humanReadableType="TemplateParameter"
+		type="7038">
+	</mapping>
 		<!-- Link labels -->
     </diagramMappings>
 </extension>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/ModelPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/ModelPreferencePage.java
index b65cdb493dd..e5684450c39 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/ModelPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/ModelPreferencePage.java
@@ -35,10 +35,10 @@ public class ModelPreferencePage extends PackageDiagramNodePreferencePage {
 	/** Static attribute initialization */
 	static {
 		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("PackageableElementCompartment", Boolean.TRUE); //$NON-NLS-1$	
+		compartmentDefaultVisibilityMap.put("packaged elements", Boolean.TRUE); //$NON-NLS-1$	
 
 		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentTitleDefaultVisibilityMap.put("PackageableElementCompartment", Boolean.TRUE); //$NON-NLS-1$
+		compartmentTitleDefaultVisibilityMap.put("packaged elements", Boolean.TRUE); //$NON-NLS-1$
 
 		// Start of user code custom static initializations
 		// End of user code
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackagePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackagePreferencePage.java
index 981e2158c01..b765504af9f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackagePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackagePreferencePage.java
@@ -35,10 +35,10 @@ public class PackagePreferencePage extends PackageDiagramNodePreferencePage {
 	/** Static attribute initialization */
 	static {
 		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentDefaultVisibilityMap.put("PackageableElementCompartment", Boolean.TRUE); //$NON-NLS-1$	
+		compartmentDefaultVisibilityMap.put("packaged elements", Boolean.TRUE); //$NON-NLS-1$	
 
 		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
-		compartmentTitleDefaultVisibilityMap.put("PackageableElementCompartment", Boolean.TRUE); //$NON-NLS-1$
+		compartmentTitleDefaultVisibilityMap.put("packaged elements", Boolean.TRUE); //$NON-NLS-1$
 
 		// Start of user code custom static initializations
 		// End of user code
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src/org/eclipse/papyrus/uml/diagram/pkg/CustomModelPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src/org/eclipse/papyrus/uml/diagram/pkg/CustomModelPreferencePage.java
index d51b074bd9d..9f2c29565fd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src/org/eclipse/papyrus/uml/diagram/pkg/CustomModelPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src/org/eclipse/papyrus/uml/diagram/pkg/CustomModelPreferencePage.java
@@ -20,7 +20,7 @@ import org.eclipse.papyrus.uml.diagram.pkg.preferences.ModelPreferencePage;
 public class CustomModelPreferencePage extends ModelPreferencePage {

 

 	static {

-		compartmentTitleDefaultVisibilityMap.put("PackageableElementCompartment", Boolean.FALSE); //$NON-NLS-1$

+		compartmentTitleDefaultVisibilityMap.put("packaged elements", Boolean.FALSE); //$NON-NLS-1$

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src/org/eclipse/papyrus/uml/diagram/pkg/CustomPackagePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src/org/eclipse/papyrus/uml/diagram/pkg/CustomPackagePreferencePage.java
index 1e2c4baac7f..7332b08f5b9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src/org/eclipse/papyrus/uml/diagram/pkg/CustomPackagePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src/org/eclipse/papyrus/uml/diagram/pkg/CustomPackagePreferencePage.java
@@ -20,7 +20,7 @@ import org.eclipse.papyrus.uml.diagram.pkg.preferences.PackagePreferencePage;
 public class CustomPackagePreferencePage extends PackagePreferencePage {

 

 	static {

-		compartmentTitleDefaultVisibilityMap.put("PackageableElementCompartment", Boolean.FALSE); //$NON-NLS-1$

+		compartmentTitleDefaultVisibilityMap.put("packaged elements", Boolean.FALSE); //$NON-NLS-1$

 	}

 

 	/**

diff --git a/plugins/uml/org.eclipse.papyrus.uml.commands/src/org/eclipse/papyrus/uml/commands/command/GMFtoEMFCommandWrapper.java b/plugins/uml/org.eclipse.papyrus.uml.commands/src/org/eclipse/papyrus/uml/commands/command/GMFtoEMFCommandWrapper.java
deleted file mode 100644
index 5885e0b414d..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.commands/src/org/eclipse/papyrus/uml/commands/command/GMFtoEMFCommandWrapper.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.commands.command;

-

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-

-/**

- * A EMF Command that wraps a GMF command. Each method is redirected to the GMF one.

- * 

- * @deprecated use {@link org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper} instead

- */

-public class GMFtoEMFCommandWrapper extends org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper {

-

-	/**

-	 * Constructor.

-	 * 

-	 * @param gmfCommand

-	 *        the gmf command

-	 */

-	public GMFtoEMFCommandWrapper(ICommand gmfCommand) {

-		super(gmfCommand);

-	}

-}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.commands/src/org/eclipse/papyrus/uml/commands/command/PasteElementCommand.java b/plugins/uml/org.eclipse.papyrus.uml.commands/src/org/eclipse/papyrus/uml/commands/command/PasteElementCommand.java
index f6e8fa9a96e..6a1c419f4fa 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.commands/src/org/eclipse/papyrus/uml/commands/command/PasteElementCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.commands/src/org/eclipse/papyrus/uml/commands/command/PasteElementCommand.java
@@ -1,310 +1,321 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.commands.command;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Map;

-import java.util.Set;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.emf.common.command.AbstractCommand;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.util.EcoreUtil;

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

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.commands.Activator;

-import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;

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

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

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

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

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-;

-

-/**

- * this handler has in charge to exexute the paste of UML element with their applied stereotypes

- * 

- */

-public class PasteElementCommand extends AbstractCommand {

-

-	protected ArrayList<EObject> eobjectTopaste = null;

-

-	protected ArrayList<EObject> stereotypeApplicationTopaste = null;

-

-	protected EObject targetOwner;

-

-	protected CompositeCommand command;

-

-	//the prefix for the duplicated object

-	protected String COPY_OF = "CopyOf";

-

-	/**

-	 * get the command do the paste on the target owner

-	 * 

-	 * @param domain

-	 *        the editing owner

-	 * @param targetOwner

-	 *        the element where the paste will be done

-	 */

-	public PasteElementCommand(EditingDomain domain, EObject targetOwner) {

-		super();

-

-		if(domain.getClipboard() != null) {

-			//1. get Data from the clipboard

-			Collection<Object> rawData = domain.getClipboard();

-

-			//2. filter only EObject

-			ArrayList<EObject> eobjectsTopaste = new ArrayList<EObject>();

-			Iterator<Object> iterData = rawData.iterator();

-			while(iterData.hasNext()) {

-				Object object = iterData.next();

-				if(object instanceof EObject) {

-					eobjectsTopaste.add((EObject)object);

-				}

-			}

-

-			// 2b retrieve now the original stereotype application

-			List<EObject> originalStereotypeApplications = new ArrayList<EObject>();

-			Iterator<EObject> selecIterator = eobjectsTopaste.iterator();

-			while(selecIterator.hasNext()) {

-				EObject eObject = selecIterator.next();

-

-				if(eObject instanceof Element) {

-					originalStereotypeApplications.addAll(((Element)eObject).getStereotypeApplications());

-				}

-				//copy stereotype contained into

-				Iterator<EObject> iter = eObject.eAllContents();

-				while(iter.hasNext()) {

-					EObject subeObject = iter.next();

-					if(subeObject instanceof Element) {

-						originalStereotypeApplications.addAll(((Element)subeObject).getStereotypeApplications());

-					}

-

-				}

-			}

-			eobjectsTopaste.addAll(originalStereotypeApplications);

-

-			//3. Copy all eObjects (inspired from PasteFromClipboardCommand)

-			// Collection<EObject> duplicatedObject = EcoreUtil.copyAll(eobjectsTopaste);

-			EcoreUtil.Copier copier = new EcoreUtil.Copier();

-			copier.copyAll(eobjectsTopaste);

-			copier.copyReferences();

-			Map<EObject, EObject> duplicatedObjects = new HashMap<EObject, EObject>();

-			duplicatedObjects.putAll(copier);

-

-			//4. filter eobject that are UML elements and application of stereotypes

-			Iterator<EObject> iter = duplicatedObjects.values().iterator();

-			eobjectTopaste = new ArrayList<EObject>();

-			stereotypeApplicationTopaste = new ArrayList<EObject>();

-			while(iter.hasNext()) {

-				EObject eObject = iter.next();

-				boolean isaUMLElement = false;

-				if(eObject instanceof Element) {

-					isaUMLElement = true;

-				}

-				//functionality that comes from UML2 plugins

-				Stereotype st = UMLUtil.getStereotype(eObject);

-				if(isaUMLElement && !originalStereotypeApplications.contains(eObject)) {

-					eobjectTopaste.add(eObject);

-				}

-			}

-

-			// 4b retrieve stereotypeapplications to paste

-			Iterator<EObject> stereotypeIterator = originalStereotypeApplications.listIterator();

-			while(stereotypeIterator.hasNext()) {

-				EObject originalStereotypeApp = stereotypeIterator.next();

-				EObject duplicateStereotype = duplicatedObjects.get(originalStereotypeApp);

-				if(duplicateStereotype == null) {

-					Activator.log.debug("warning a stereotype could not be copied/paste : " + originalStereotypeApp);

-				} else {

-					stereotypeApplicationTopaste.add(duplicateStereotype);

-				}

-			}

-

-			this.targetOwner = targetOwner;

-

-			//5. prepare the move command to move UML element to their new owner

-			//Nota: move only the "root" semantic elements to be paste

-			List<EObject> objectsToMove = new ArrayList<EObject>();

-			Iterator<EObject> it = eobjectsTopaste.iterator();

-			while(it.hasNext()) {

-				EObject eObject = it.next();

-				boolean isaUMLElement = false;

-				if(eObject instanceof Element) {

-					isaUMLElement = true;

-				}

-				//functionality that comes from UML2 plugins

-				if((isaUMLElement && !originalStereotypeApplications.contains(eObject))) {// UML element, but not a stereotype => should be moved

-					// this is one of the original elements to paste, not a stereotype.

-					// the copy of this one should be moved

-					EObject copyObject = duplicatedObjects.get(eObject);

-					if(copyObject != null) {

-						objectsToMove.add(copyObject);

-					}

-				}

-			}

-

-

-			MoveRequest moveRequest = new MoveRequest(targetOwner, objectsToMove);

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(targetOwner);

-			if(provider != null) {

-				command = new CompositeCommand("Copy Object");

-				command.compose(provider.getEditCommand(moveRequest));

-			}

-

-			//5 bis. Rename the duplicated objects (only the root elements that are copied, no need to rename *all* nested elements)

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

-				EObject element = objectsToMove.get(i);

-				if(element instanceof NamedElement && domain instanceof TransactionalEditingDomain) {

-					String newName = NLS.bind(COPY_OF + "_{0}_", ((NamedElement)element).getName());

-					String incrementedName = NamedElementUtil.getDefaultNameWithIncrementFromBase(newName, targetOwner.eContents());

-					SetRequest renameRequest = new SetRequest((TransactionalEditingDomain)domain, element, UMLFactory.eINSTANCE.getUMLPackage().getNamedElement_Name(), incrementedName);

-					if(provider != null && command != null) {

-						command.compose(provider.getEditCommand(renameRequest));

-					}

-				}

-			}

-

-			ICommand externalObjectsDuplicateCommand = getExternalObjectsDuplicateCommand(duplicatedObjects, targetOwner);

-			if(externalObjectsDuplicateCommand != null && command != null) {

-				command.compose(externalObjectsDuplicateCommand);

-			}

-

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public void execute() {

-		// for steps 1. 2. 3. 4. 5. see constructor

-		//6. execute the move command for UML element

-		if(command != null) {

-			try {

-				command.execute(new NullProgressMonitor(), null);

-			} catch (ExecutionException e) {

-				Activator.log.error(e);

-			}

-		}

-		//7. move stereotypes applications into the resource

-		Iterator<EObject> stereoApplIter = stereotypeApplicationTopaste.iterator();

-		while(stereoApplIter.hasNext()) {

-			EObject eObject = stereoApplIter.next();

-			targetOwner.eResource().getContents().add(eObject);

-

-

-		}

-

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public boolean canExecute() {

-		if(command == null) {

-			return false;

-		}

-		return command.canExecute();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public void redo() {

-		// for steps 1. 2. 3. 4. 5. see constructor

-		//6. execute the move command for UML element

-		if(command != null) {

-			try {

-				command.redo(new NullProgressMonitor(), null);

-			} catch (ExecutionException e) {

-				Activator.log.error(e);

-			}

-		}

-		//7. move stereotype application into the resource 

-		Iterator<EObject> stereoApplIter = stereotypeApplicationTopaste.iterator();

-		while(stereoApplIter.hasNext()) {

-			EObject eObject = stereoApplIter.next();

-			targetOwner.eResource().getContents().add(eObject);

-

-

-		}

-

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void undo() {

-		// for steps 1. 2. 3. 4. 5. see constructor

-		//6. Undo the move command for UML element

-		try {

-			IProgressMonitor monitor = new NullProgressMonitor();

-			command.undo(monitor, null);

-		} catch (ExecutionException e) {

-			Activator.log.error(e);

-		}

-		//7. remove stereotype application from the resource

-		Iterator<EObject> stereoApplIter = stereotypeApplicationTopaste.iterator();

-		while(stereoApplIter.hasNext()) {

-			EObject eObject = stereoApplIter.next();

-			targetOwner.eResource().getContents().remove(eObject);

-		}

-	}

-

-	/**

-	 * Returns the list of external objects to duplicate

-	 * 

-	 * @return the list of external objects to duplicate or an empty list if not elements are found to add.

-	 */

-	protected ICommand getExternalObjectsDuplicateCommand(Map duplicatedElementsMap, EObject targetOwner) {

-		CompositeCommand result = new CompositeCommand("Additional Duplications");

-		Set<Object> duplicatedExternalElements = new HashSet<Object>();

-

-		for(Object o : duplicatedElementsMap.keySet()) {

-			if(o instanceof EObject) {

-				EObject object = (EObject)o;

-				DuplicateElementsRequest request = new DuplicateElementsRequest(Collections.singletonList(object));

-				request.setAllDuplicatedElementsMap(duplicatedElementsMap);

-				request.setParameter("Additional_Duplicated_Elements", duplicatedExternalElements);

-				request.setParameter("Target_Owner", targetOwner);

-				IElementEditService service = ElementEditServiceUtils.getCommandProvider(object);

-				ICommand command = service.getEditCommand(request);

-				if(command != null) {

-					result.add(command);

-				}

-			}

-		}

-

-		return result.isEmpty() ? null : result.reduce();

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Patrick Tessier (CEA LIST) patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.commands.command;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.common.command.AbstractCommand;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.uml.commands.Activator;
+import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.Stereotype;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.util.UMLUtil;
+
+
+/**
+ * this handler has in charge to exexute the paste of UML element with their applied stereotypes
+ * 
+ */
+public class PasteElementCommand extends AbstractCommand {
+
+	private static final String TARGET_OWNER = "Target_Owner"; //$NON-NLS-1$
+
+	private static final String ADDITIONAL_DUPLICATED_ELEMENTS = "Additional_Duplicated_Elements"; //$NON-NLS-1$
+
+	protected List<EObject> eobjectTopaste = null;
+
+	protected List<EObject> stereotypeApplicationTopaste = null;
+
+	protected EObject targetOwner;
+
+	protected CompositeCommand command;
+
+
+	/**
+	 * get the command do the paste on the target owner
+	 * 
+	 * @param domain
+	 *        the editing owner
+	 * @param targetOwner
+	 *        the element where the paste will be done
+	 */
+	public PasteElementCommand(EditingDomain domain, EObject targetOwner) {
+		super();
+
+		if(domain.getClipboard() != null) {
+			//1. get Data from the clipboard
+			Collection<Object> rawData = domain.getClipboard();
+
+			//2. filter only EObject
+			List<EObject> eobjectsTopaste = new ArrayList<EObject>();
+			Iterator<Object> iterData = rawData.iterator();
+			while(iterData.hasNext()) {
+				Object object = iterData.next();
+				if(object instanceof EObject) {
+					eobjectsTopaste.add((EObject)object);
+				}
+			}
+
+			// 2b retrieve now the original stereotype application
+			List<EObject> originalStereotypeApplications = new ArrayList<EObject>();
+			Iterator<EObject> selecIterator = eobjectsTopaste.iterator();
+			while(selecIterator.hasNext()) {
+				EObject eObject = selecIterator.next();
+
+				if(eObject instanceof Element) {
+					originalStereotypeApplications.addAll(((Element)eObject).getStereotypeApplications());
+				}
+				//copy stereotype contained into
+				Iterator<EObject> iter = eObject.eAllContents();
+				while(iter.hasNext()) {
+					EObject subeObject = iter.next();
+					if(subeObject instanceof Element) {
+						originalStereotypeApplications.addAll(((Element)subeObject).getStereotypeApplications());
+					}
+
+				}
+			}
+			eobjectsTopaste.addAll(originalStereotypeApplications);
+
+			//3. Copy all eObjects (inspired from PasteFromClipboardCommand)
+			// Collection<EObject> duplicatedObject = EcoreUtil.copyAll(eobjectsTopaste);
+			EcoreUtil.Copier copier = new EcoreUtil.Copier();
+			copier.copyAll(eobjectsTopaste);
+			copier.copyReferences();
+			Map<EObject, EObject> duplicatedObjects = new HashMap<EObject, EObject>();
+			duplicatedObjects.putAll(copier);
+
+			//4. filter eobject that are UML elements and application of stereotypes
+			Iterator<EObject> iter = duplicatedObjects.values().iterator();
+			eobjectTopaste = new ArrayList<EObject>();
+			stereotypeApplicationTopaste = new ArrayList<EObject>();
+			while(iter.hasNext()) {
+				EObject eObject = iter.next();
+				boolean isaUMLElement = false;
+				if(eObject instanceof Element) {
+					isaUMLElement = true;
+				}
+				//functionality that comes from UML2 plugins
+				Stereotype st = UMLUtil.getStereotype(eObject);
+				if(isaUMLElement && !originalStereotypeApplications.contains(eObject)) {
+					eobjectTopaste.add(eObject);
+				}
+			}
+
+			// 4b retrieve stereotypeapplications to paste
+			Iterator<EObject> stereotypeIterator = originalStereotypeApplications.listIterator();
+			while(stereotypeIterator.hasNext()) {
+				EObject originalStereotypeApp = stereotypeIterator.next();
+				EObject duplicateStereotype = duplicatedObjects.get(originalStereotypeApp);
+				if(duplicateStereotype == null) {
+					Activator.log.debug("warning a stereotype could not be copied/paste : " + originalStereotypeApp);
+				} else {
+					stereotypeApplicationTopaste.add(duplicateStereotype);
+				}
+			}
+
+			this.targetOwner = targetOwner;
+
+			//5. prepare the move command to move UML element to their new owner
+			//Nota: move only the "root" semantic elements to be paste
+			List<EObject> objectsToMove = new ArrayList<EObject>();
+			Iterator<EObject> it = eobjectsTopaste.iterator();
+			while(it.hasNext()) {
+				EObject eObject = it.next();
+				boolean isaUMLElement = false;
+				if(eObject instanceof Element) {
+					isaUMLElement = true;
+				}
+				//functionality that comes from UML2 plugins
+				if((isaUMLElement && !originalStereotypeApplications.contains(eObject))) {// UML element, but not a stereotype => should be moved
+					// this is one of the original elements to paste, not a stereotype.
+					// the copy of this one should be moved
+					EObject copyObject = duplicatedObjects.get(eObject);
+					if(copyObject != null) {
+						objectsToMove.add(copyObject);
+					}
+				}
+			}
+
+
+			MoveRequest moveRequest = new MoveRequest(targetOwner, objectsToMove);
+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(targetOwner);
+			if(provider != null) {
+				command = new CompositeCommand("Copy Object");
+				command.compose(provider.getEditCommand(moveRequest));
+			}
+
+			renameDuplicatedObject(domain, targetOwner, objectsToMove, provider);
+
+			ICommand externalObjectsDuplicateCommand = getExternalObjectsDuplicateCommand(duplicatedObjects, targetOwner);
+			if(externalObjectsDuplicateCommand != null && command != null) {
+				command.compose(externalObjectsDuplicateCommand);
+			}
+
+		}
+	}
+
+	
+	/**
+	 *  Rename duplicated objects
+	 * @param domain
+	 * @param targetOwner
+	 * @param objectsToMove
+	 * @param provider
+	 */
+	private void renameDuplicatedObject(EditingDomain domain,
+			EObject targetOwner, List<EObject> objectsToMove,
+			IElementEditService provider) {
+		//5 bis. Rename the duplicated objects (only the root elements that are copied, no need to rename *all* nested elements)
+		for(int i = 0; i < objectsToMove.size(); i++) {
+			EObject element = objectsToMove.get(i);
+			if(element instanceof NamedElement && domain instanceof TransactionalEditingDomain) {
+				String incrementedName = NamedElementUtil.getDefaultCopyNameWithIncrement((NamedElement)element,targetOwner.eContents());
+				SetRequest renameRequest = new SetRequest((TransactionalEditingDomain)domain, element, UMLFactory.eINSTANCE.getUMLPackage().getNamedElement_Name(), incrementedName);
+				if(provider != null && command != null) {
+					command.compose(provider.getEditCommand(renameRequest));
+				}
+			}
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public void execute() {
+		// for steps 1. 2. 3. 4. 5. see constructor
+		//6. execute the move command for UML element
+		if(command != null) {
+			try {
+				command.execute(new NullProgressMonitor(), null);
+			} catch (ExecutionException e) {
+				Activator.log.error(e);
+			}
+		}
+		//7. move stereotypes applications into the resource
+		Iterator<EObject> stereoApplIter = stereotypeApplicationTopaste.iterator();
+		while(stereoApplIter.hasNext()) {
+			EObject eObject = stereoApplIter.next();
+			targetOwner.eResource().getContents().add(eObject);
+		}
+
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean canExecute() {
+		if(command == null) {
+			return false;
+		}
+		return command.canExecute();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public void redo() {
+		// for steps 1. 2. 3. 4. 5. see constructor
+		//6. execute the move command for UML element
+		if(command != null) {
+			try {
+				command.redo(new NullProgressMonitor(), null);
+			} catch (ExecutionException e) {
+				Activator.log.error(e);
+			}
+		}
+		//7. move stereotype application into the resource 
+		Iterator<EObject> stereoApplIter = stereotypeApplicationTopaste.iterator();
+		while(stereoApplIter.hasNext()) {
+			EObject eObject = stereoApplIter.next();
+			targetOwner.eResource().getContents().add(eObject);
+
+
+		}
+
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void undo() {
+		// for steps 1. 2. 3. 4. 5. see constructor
+		//6. Undo the move command for UML element
+		try {
+			IProgressMonitor monitor = new NullProgressMonitor();
+			command.undo(monitor, null);
+		} catch (ExecutionException e) {
+			Activator.log.error(e);
+		}
+		//7. remove stereotype application from the resource
+		Iterator<EObject> stereoApplIter = stereotypeApplicationTopaste.iterator();
+		while(stereoApplIter.hasNext()) {
+			EObject eObject = stereoApplIter.next();
+			targetOwner.eResource().getContents().remove(eObject);
+		}
+	}
+
+	/**
+	 * Returns the list of external objects to duplicate
+	 * 
+	 * @return the list of external objects to duplicate or an empty list if not elements are found to add.
+	 */
+	protected ICommand getExternalObjectsDuplicateCommand(Map duplicatedElementsMap, EObject targetOwner) {
+		CompositeCommand result = new CompositeCommand("Additional Duplications");
+		Set<Object> duplicatedExternalElements = new HashSet<Object>();
+
+		for(Object o : duplicatedElementsMap.keySet()) {
+			if(o instanceof EObject) {
+				EObject object = (EObject)o;
+				DuplicateElementsRequest request = new DuplicateElementsRequest(Collections.singletonList(object));
+				request.setAllDuplicatedElementsMap(duplicatedElementsMap);
+				request.setParameter(ADDITIONAL_DUPLICATED_ELEMENTS, duplicatedExternalElements);
+				request.setParameter(TARGET_OWNER, targetOwner);
+				IElementEditService service = ElementEditServiceUtils.getCommandProvider(object);
+				ICommand command = service.getEditCommand(request);
+				if(command != null) {
+					result.add(command);
+				}
+			}
+		}
+
+		return result.isEmpty() ? null : result.reduce();
+	}
+}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.pastemanager/.classpath b/plugins/uml/org.eclipse.papyrus.uml.pastemanager/.classpath
deleted file mode 100644
index 2d1a4302f04..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.pastemanager/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/plugins/uml/org.eclipse.papyrus.uml.pastemanager/.project b/plugins/uml/org.eclipse.papyrus.uml.pastemanager/.project
deleted file mode 100644
index 73cc7c1b4cf..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.pastemanager/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.pastemanager</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

diff --git a/plugins/uml/org.eclipse.papyrus.uml.pastemanager/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/org.eclipse.papyrus.uml.pastemanager/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2858285d317..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.pastemanager/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Tue Mar 16 14:27:37 CET 2010

-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

diff --git a/plugins/uml/org.eclipse.papyrus.uml.pastemanager/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.pastemanager/META-INF/MANIFEST.MF
deleted file mode 100644
index 01e5da98314..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.pastemanager/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.uml2.uml,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.0.0",

- org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.0"

-Export-Package: org.eclipse.papyrus.uml.pastemanager,

- org.eclipse.papyrus.uml.pastemanager.command,

- org.eclipse.papyrus.uml.pastemanager.request,

- org.eclipse.papyrus.uml.pastemanager.service

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.pastemanager.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.pastemanager;singleton:=t

- rue

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-

diff --git a/plugins/uml/org.eclipse.papyrus.uml.pastemanager/about.html b/plugins/uml/org.eclipse.papyrus.uml.pastemanager/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.pastemanager/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

diff --git a/plugins/uml/org.eclipse.papyrus.uml.pastemanager/build.properties b/plugins/uml/org.eclipse.papyrus.uml.pastemanager/build.properties
deleted file mode 100644
index 74da397f78f..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.pastemanager/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-#

-#Mon Sep 12 09:30:02 CEST 2011

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               schema/,\

-               plugin.properties,\

-               about.html

-output..=bin/

-src.includes = about.html

-source..=src/

-bin..=bin/

diff --git a/plugins/uml/org.eclipse.papyrus.uml.pastemanager/plugin.properties b/plugins/uml/org.eclipse.papyrus.uml.pastemanager/plugin.properties
deleted file mode 100644
index 0ac10f3fe17..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.pastemanager/plugin.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-##########################################################################################
-# Copyright (c) 2010 CEA LIST.
-# 
-#     
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
-#
-########################################################################################
-pluginName=Papyrus Paste Management(Incubation)
-providerName=Eclipse Modeling Project
-
-
diff --git a/plugins/uml/org.eclipse.papyrus.uml.pastemanager/plugin.xml b/plugins/uml/org.eclipse.papyrus.uml.pastemanager/plugin.xml
deleted file mode 100644
index eaeeb1d03a6..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.pastemanager/plugin.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension-point id="pasteCommandProvider" name="pasteCommandProvider" schema="schema/pasteCommandProvider.exsd"/>

-

-

-</plugin>

diff --git a/plugins/uml/org.eclipse.papyrus.uml.pastemanager/src/org/eclipse/papyrus/uml/pastemanager/Activator.java b/plugins/uml/org.eclipse.papyrus.uml.pastemanager/src/org/eclipse/papyrus/uml/pastemanager/Activator.java
deleted file mode 100644
index eca50d5fe8e..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.pastemanager/src/org/eclipse/papyrus/uml/pastemanager/Activator.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- * 

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.pastemanager;

-

-import org.eclipse.papyrus.infra.core.log.LogHelper;

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends AbstractUIPlugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.pastemanager"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	/** Logging helper */

-	public static LogHelper log;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		// register the login helper

-		log = new LogHelper(plugin);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		log = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.pastemanager/src/org/eclipse/papyrus/uml/pastemanager/command/GEFtoEMFCommandWrapper.java b/plugins/uml/org.eclipse.papyrus.uml.pastemanager/src/org/eclipse/papyrus/uml/pastemanager/command/GEFtoEMFCommandWrapper.java
deleted file mode 100644
index db7f5d82ded..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.pastemanager/src/org/eclipse/papyrus/uml/pastemanager/command/GEFtoEMFCommandWrapper.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

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

- *  Vinent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Add undo

- *****************************************************************************/

-package org.eclipse.papyrus.uml.pastemanager.command;

-

-import org.eclipse.gef.commands.Command;

-

-/**

- * A EMF Command that wraps a GEF command. Each method is redirected to the GEF one.

- * 

- * @deprecated use {@link org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper} instead

- */

-public class GEFtoEMFCommandWrapper extends org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper {

-

-	/**

-	 * Constructor.

-	 * 

-	 * @param gefCommand

-	 *        the gef command

-	 */

-	public GEFtoEMFCommandWrapper(Command gefCommand) {

-		super(gefCommand);

-	}

-}

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/NamedElementUtil.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/NamedElementUtil.java
index 13da0b0c704..9223c881e91 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/NamedElementUtil.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/NamedElementUtil.java
@@ -1,186 +1,194 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

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

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann TANGUY (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *  

- *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.utils;

-

-import java.util.Collection;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;

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

-

-/**

- * Utility class for <code>org.eclipse.uml2.uml.NamedElement</code><BR>

- */

-public class NamedElementUtil {

-

-	public static final String QUALIFIED_NAME_SEPARATOR = "::";

-

-	private final static String PUBLIC_STRING = "+";

-

-	private final static String PROTECTED_STRING = "#";

-

-	private final static String PRIVATE_STRING = "-";

-

-	private final static String PACKAGE_STRING = "~";

-

-	/**

-	 * A helper method to calculate the max depth of an element

-	 * 

-	 * @param the

-	 *        named element

-	 * @return the maximum depth found in qualified name

-	 */

-	public static int getQualifiedNameMaxDepth(NamedElement namedElement) {

-		int d = 0;

-		String s = namedElement.getQualifiedName();

-		if(s == null) {

-			return 0;

-		}

-		int n = 0;

-		while((n = s.indexOf(QUALIFIED_NAME_SEPARATOR, n)) != -1) {

-			n += 2;

-			d++;

-		}

-		return d;

-	}

-

-	/**

-	 * generate a default name for the eobject in parameter the format is :

-	 * "eclassName"+"max(elementOfTheSameName in the container)" + 1

-	 * 

-	 * @param newElement

-	 * @return

-	 */

-	public static String getDefaultNameWithIncrement(EObject newElement) {

-		if(newElement.eContainer() != null) {

-			return getDefaultNameWithIncrement(newElement, newElement.eContainer().eContents());

-		}

-		return null;

-	}

-

-	/**

-	 * generate a default name for the eobject in parameter the format is :

-	 * "eclassName"+"max(elementOfTheSameName in the container)" + 1 the method checks already

-	 * existing element in contents parameter

-	 * 

-	 * @param newElement

-	 */

-	@SuppressWarnings("rawtypes")

-	public static String getDefaultNameWithIncrement(EObject newElement, Collection contents) {

-		return getDefaultNameWithIncrement("", newElement, contents);

-	}

-

-	@SuppressWarnings("rawtypes")

-	public static String getDefaultNameWithIncrement(String prefix, EObject newElement, Collection contents) {

-		if(prefix == null) {

-			prefix = "";

-		}

-

-		return getDefaultNameWithIncrementFromBase(prefix + newElement.eClass().getName(), contents);

-	}

-

-	@SuppressWarnings("rawtypes")

-	public static String getDefaultNameWithIncrementFromBase(String base, Collection contents) {

-		if(base.equalsIgnoreCase("property")) {

-			base = "Attribute";

-		}

-		int nextNumber = 1;

-

-		for(Object o : contents) {

-			if(o instanceof EObject) {

-				String name = EMFCoreUtil.getName((EObject)o);

-				if(name != null && name.startsWith(base)) {

-					String end = name.substring(base.length());

-					int nextNumberTmp = 1;

-

-					try {

-						nextNumberTmp = Integer.parseInt(end) + 1;

-					} catch (NumberFormatException ex) {

-					}

-

-					if(nextNumberTmp > nextNumber) {

-						nextNumber = nextNumberTmp;

-					}

-				}

-			}

-		}

-

-		return base + nextNumber;

-	}

-

-	/**

-	 * Give the visibility of the {@link NamedElement} as a string, as defined in the UML2 standard.

-	 * 

-	 * @return A String representing the visibility of the {@link NamedElement}. Possible values:

-	 *         <ul>

-	 *         <li>public: <code>"+"</code>

-	 *         <li>private: <code>"-"</code>

-	 *         <li>protected: <code>"#"</code>

-	 *         <li>package: <code>"~"</code>

-	 *         </ul>

-	 */

-	public static String getVisibilityAsSign(NamedElement element) {

-		String vKindValue = "";

-

-		switch(element.getVisibility().getValue()) {

-		case org.eclipse.uml2.uml.VisibilityKind.PUBLIC:

-			vKindValue = PUBLIC_STRING;

-			break;

-		case org.eclipse.uml2.uml.VisibilityKind.PRIVATE:

-			vKindValue = PRIVATE_STRING;

-			break;

-		case org.eclipse.uml2.uml.VisibilityKind.PACKAGE:

-			vKindValue = PACKAGE_STRING;

-			break;

-		case org.eclipse.uml2.uml.VisibilityKind.PROTECTED:

-			vKindValue = PROTECTED_STRING;

-			break;

-		}

-		return vKindValue;

-	}

-

-	/**

-	 * Returns the name of an element, given its qualified name

-	 * 

-	 * @param qualifiedName

-	 *        the qualified name of the element

-	 * @return the name of the element. It shall never be <code>null</code>.

-	 */

-	public static String getNameFromQualifiedName(String qualifiedName) {

-		String name = qualifiedName.substring(qualifiedName.lastIndexOf(NamedElement.SEPARATOR) + NamedElement.SEPARATOR.length());

-		return (name != null) ? name : "";

-	}

-

-	/**

-	 * 

-	 * @param childQualifiedName

-	 *        the qualifiedName of an element

-	 * @return

-	 *         the qualified name of its parent

-	 */

-	public static String getParentQualifiedName(final String childQualifiedName) {

-		final String childName = getNameFromQualifiedName(childQualifiedName);

-		final String parentQualifiedName = childQualifiedName.substring(0, childQualifiedName.length() - (NamedElement.SEPARATOR.length() + childName.length()));

-		return (parentQualifiedName != null) ? parentQualifiedName : "";

-	}

-

-

-	public static String getName(NamedElement element) {

-		if(element.getName() != null) {

-			return element.getName();

-		} else {

-			return (NamedElementUtil.getDefaultNameWithIncrement(element));

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2009 CEA LIST.
+ *
+ *    
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  Yann TANGUY (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
+ *  
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.tools.utils;
+
+import java.util.Collection;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.uml2.uml.NamedElement;
+
+/**
+ * Utility class for <code>org.eclipse.uml2.uml.NamedElement</code><BR>
+ */
+public class NamedElementUtil {
+
+	public static final String COPY_OF = "CopyOf";
+	
+	public static final String QUALIFIED_NAME_SEPARATOR = "::";
+
+	private final static String PUBLIC_STRING = "+";
+
+	private final static String PROTECTED_STRING = "#";
+
+	private final static String PRIVATE_STRING = "-";
+
+	private final static String PACKAGE_STRING = "~";
+
+	/**
+	 * A helper method to calculate the max depth of an element
+	 * 
+	 * @param the
+	 *        named element
+	 * @return the maximum depth found in qualified name
+	 */
+	public static int getQualifiedNameMaxDepth(NamedElement namedElement) {
+		int d = 0;
+		String s = namedElement.getQualifiedName();
+		if(s == null) {
+			return 0;
+		}
+		int n = 0;
+		while((n = s.indexOf(QUALIFIED_NAME_SEPARATOR, n)) != -1) {
+			n += 2;
+			d++;
+		}
+		return d;
+	}
+
+	/**
+	 * generate a default name for the eobject in parameter the format is :
+	 * "eclassName"+"max(elementOfTheSameName in the container)" + 1
+	 * 
+	 * @param newElement
+	 * @return
+	 */
+	public static String getDefaultNameWithIncrement(EObject newElement) {
+		if(newElement.eContainer() != null) {
+			return getDefaultNameWithIncrement(newElement, newElement.eContainer().eContents());
+		}
+		return null;
+	}
+
+	/**
+	 * generate a default name for the eobject in parameter the format is :
+	 * "eclassName"+"max(elementOfTheSameName in the container)" + 1 the method checks already
+	 * existing element in contents parameter
+	 * 
+	 * @param newElement
+	 */
+	@SuppressWarnings("rawtypes")
+	public static String getDefaultNameWithIncrement(EObject newElement, Collection contents) {
+		return getDefaultNameWithIncrement("", newElement, contents);
+	}
+
+	@SuppressWarnings("rawtypes")
+	public static String getDefaultCopyNameWithIncrement(NamedElement namedElement, Collection contents) {
+		String newName = NLS.bind(COPY_OF + "_{0}_", namedElement.getName());
+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(newName, contents);
+	}
+	
+	@SuppressWarnings("rawtypes")
+	public static String getDefaultNameWithIncrement(String prefix, EObject newElement, Collection contents) {
+		if(prefix == null) {
+			prefix = "";
+		}
+		return getDefaultNameWithIncrementFromBase(prefix + newElement.eClass().getName(), contents);
+	}
+
+	@SuppressWarnings("rawtypes")
+	public static String getDefaultNameWithIncrementFromBase(String base, Collection contents) {
+		if(base.equalsIgnoreCase("property")) {
+			base = "Attribute";
+		}
+		int nextNumber = 1;
+
+		for(Object o : contents) {
+			if(o instanceof EObject) {
+				String name = EMFCoreUtil.getName((EObject)o);
+				if(name != null && name.startsWith(base)) {
+					String end = name.substring(base.length());
+					int nextNumberTmp = 1;
+
+					try {
+						nextNumberTmp = Integer.parseInt(end) + 1;
+					} catch (NumberFormatException ex) {
+					}
+
+					if(nextNumberTmp > nextNumber) {
+						nextNumber = nextNumberTmp;
+					}
+				}
+			}
+		}
+
+		return base + nextNumber;
+	}
+
+	/**
+	 * Give the visibility of the {@link NamedElement} as a string, as defined in the UML2 standard.
+	 * 
+	 * @return A String representing the visibility of the {@link NamedElement}. Possible values:
+	 *         <ul>
+	 *         <li>public: <code>"+"</code>
+	 *         <li>private: <code>"-"</code>
+	 *         <li>protected: <code>"#"</code>
+	 *         <li>package: <code>"~"</code>
+	 *         </ul>
+	 */
+	public static String getVisibilityAsSign(NamedElement element) {
+		String vKindValue = "";
+
+		switch(element.getVisibility().getValue()) {
+		case org.eclipse.uml2.uml.VisibilityKind.PUBLIC:
+			vKindValue = PUBLIC_STRING;
+			break;
+		case org.eclipse.uml2.uml.VisibilityKind.PRIVATE:
+			vKindValue = PRIVATE_STRING;
+			break;
+		case org.eclipse.uml2.uml.VisibilityKind.PACKAGE:
+			vKindValue = PACKAGE_STRING;
+			break;
+		case org.eclipse.uml2.uml.VisibilityKind.PROTECTED:
+			vKindValue = PROTECTED_STRING;
+			break;
+		}
+		return vKindValue;
+	}
+
+	/**
+	 * Returns the name of an element, given its qualified name
+	 * 
+	 * @param qualifiedName
+	 *        the qualified name of the element
+	 * @return the name of the element. It shall never be <code>null</code>.
+	 */
+	public static String getNameFromQualifiedName(String qualifiedName) {
+		String name = qualifiedName.substring(qualifiedName.lastIndexOf(NamedElement.SEPARATOR) + NamedElement.SEPARATOR.length());
+		return (name != null) ? name : "";
+	}
+
+	/**
+	 * 
+	 * @param childQualifiedName
+	 *        the qualifiedName of an element
+	 * @return
+	 *         the qualified name of its parent
+	 */
+	public static String getParentQualifiedName(final String childQualifiedName) {
+		final String childName = getNameFromQualifiedName(childQualifiedName);
+		final String parentQualifiedName = childQualifiedName.substring(0, childQualifiedName.length() - (NamedElement.SEPARATOR.length() + childName.length()));
+		return (parentQualifiedName != null) ? parentQualifiedName : "";
+	}
+
+
+	public static String getName(NamedElement element) {
+		if(element.getName() != null) {
+			return element.getName();
+		} else {
+			return (NamedElementUtil.getDefaultNameWithIncrement(element));
+		}
+	}
+}